diff --git a/Android.mk b/Android.mk
index 23ef0a5..aa64ce6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -132,32 +132,25 @@ $(built_dex_intermediate): $(cm_framework_res_R_stamp)
 $(full_target): $(cm_framework_built) $(gen)
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
-# the sdk as a jar for publish, not built as part of full target
+# the sdk as an aar for publish, not built as part of full target
 # DO NOT LINK AGAINST THIS IN BUILD
 # ============================================================
 include $(CLEAR_VARS)
 
-LOCAL_MODULE:= org.cyanogenmod.platform.sdk.jar
-LOCAL_MODULE_TAGS := optional
-LOCAL_REQUIRED_MODULES := services
+LOCAL_MODULE := org.cyanogenmod.platform.sdk.aar
+
 LOCAL_JACK_ENABLED := disabled
 
-LOCAL_SRC_FILES := \
-    $(call all-java-files-under, $(cyanogenmod_sdk_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
+# just need to define this, $(TOP)/dummy should not exist
+LOCAL_SRC_FILES := $(call all-java-files-under, dummy)
 
-# Included aidl files from cyanogenmod.app namespace
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res)
+LOCAL_MANIFEST_FILE := sdk/AndroidManifest.xml
 
-cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
-    $(cm_platform_res)/cyanogenmod/platform/R.java \
-    $(cm_platform_res)/cyanogenmod/platform/Manifest.java
-
-LOCAL_INTERMEDIATE_SOURCES := \
-    $(cmsdk_LOCAL_INTERMEDIATE_SOURCES)
+LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
+$(LOCAL_MODULE) : $(built_aar)
 
 # full target for use by platform apps
 #
diff --git a/sdk/AndroidManifest.xml b/sdk/AndroidManifest.xml
new file mode 100644
index 0000000..b772ab8
--- /dev/null
+++ b/sdk/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright 2016, CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<manifest package="cyanogenmod.library">
+
+</manifest>