aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-08-16 22:33:30 -0700
committerSteve Kondik <shade@chemlab.org>2015-08-19 05:33:11 -0700
commit5ee87cbf0624b3cf6efc0d0b99857fffadce81d9 (patch)
tree3d27931944cdebc12b446c9f101c061c53b3558e /Android.mk
parent435e2f3b17b4cec4a8e5a460246b7b786ba768f6 (diff)
downloadvendor_cmsdk-5ee87cbf0624b3cf6efc0d0b99857fffadce81d9.zip
vendor_cmsdk-5ee87cbf0624b3cf6efc0d0b99857fffadce81d9.tar.gz
vendor_cmsdk-5ee87cbf0624b3cf6efc0d0b99857fffadce81d9.tar.bz2
cmsdk: Transplant CMHW into CMSDK
* Moving CMHW out of the framework and into CMSDK. Change-Id: I0b68b67d059e2310c83e253a9071d886ed6760cb
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index bac2019..b224af8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,7 +35,8 @@ LOCAL_MODULE := org.cyanogenmod.platform
LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := \
- services
+ services \
+ org.cyanogenmod.hardware
LOCAL_SRC_FILES := \
$(call all-java-files-under, $(cyanogenmod_src)) \
@@ -155,7 +156,7 @@ LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:= build/tools/droiddoc/templates-sdk
LOCAL_DROIDDOC_OPTIONS:= \
-stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/cmsdk_stubs_current_intermediates/src \
- -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.platform:org.cyanogenmod.platform \
+ -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.hardware:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.platform:org.cyanogenmod.platform \
-api $(INTERNAL_CM_PLATFORM_API_FILE) \
-removedApi $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE) \
-nodocs \
@@ -184,7 +185,7 @@ LOCAL_MODULE := cm-system-api-stubs
LOCAL_DROIDDOC_OPTIONS:=\
-stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/cmsdk_system_stubs_current_intermediates/src \
- -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.platform:org.cyanogenmod.platform \
+ -stubpackages cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.hardware:cyanogenmod.os:cyanogenmod.profiles:cyanogenmod.platform:org.cyanogenmod.platform \
-showAnnotation android.annotation.SystemApi \
-api $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE) \
-removedApi $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE) \