aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-02-15 15:25:21 -0800
committerAdnan Begovic <adnan@cyngn.com>2016-02-17 11:33:35 -0800
commit182b972c0b059d3f31dbce3a164da3b42378deb0 (patch)
tree6d2e5d014b205b1a680a3e43dfeae485842d3fd7 /Android.mk
parent34ff00c8a43436f5f66eac3890a7f64e3759d1b0 (diff)
downloadvendor_cmsdk-182b972c0b059d3f31dbce3a164da3b42378deb0.zip
vendor_cmsdk-182b972c0b059d3f31dbce3a164da3b42378deb0.tar.gz
vendor_cmsdk-182b972c0b059d3f31dbce3a164da3b42378deb0.tar.bz2
cmsdk: Set explicity dependency for res package files.
During checkapi-cm invocation under make, the api text generation dependant on the stubs (which depend on the sdk intermediates) needs the res package files: Manifest and R.java, to be available in the intermediates. Change-Id: I19921f1b5531822341a6804cf83e1b0b21b9f8bf TICKET: CYNGNOS-2049
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 6a69d25..2dfaa78 100644
--- a/Android.mk
+++ b/Android.mk
@@ -120,6 +120,12 @@ cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
LOCAL_INTERMEDIATE_SOURCES := \
$(cmsdk_LOCAL_INTERMEDIATE_SOURCES)
+# Make sure that R.java and Manifest.java are built before we build
+# the source for this library.
+cm_framework_res_R_stamp := \
+ $(call intermediates-dir-for,APPS,org.cyanogenmod.platform-res,,COMMON)/src/R.stamp
+$(full_classes_compiled_jar): $(cm_framework_res_R_stamp)
+$(built_dex_intermediate): $(cm_framework_res_R_stamp)
$(full_target): $(cm_framework_built) $(gen)
include $(BUILD_STATIC_JAVA_LIBRARY)