From 3276a6baa3f83e5d4ca5e2b4efe165604a2102fe Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 11 Oct 2017 21:34:17 -0700 Subject: [PATCH] Fix missing dependency on R.java Compiling frameworks source is missing a dependency on the R.stamp file generated by the frameworks-res aapt rule, likely caused by the switch to jack. Use LOCAL_ADDITONAL_DEPENDENCIES to insert the dependency instead of directly using build system internals. Change-Id: I897aec39957918a787df904d3093d91580de6fc4 --- Android.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Android.mk b/Android.mk index 10094713..d241da6c 100644 --- a/Android.mk +++ b/Android.mk @@ -86,8 +86,7 @@ lineage_framework_module := $(LOCAL_INSTALLED_MODULE) # the source for this library. lineage_framework_res_R_stamp := \ $(call intermediates-dir-for,APPS,org.lineageos.platform-res,,COMMON)/src/R.stamp -$(full_classes_compiled_jar): $(lineage_framework_res_R_stamp) -$(built_dex_intermediate): $(lineage_framework_res_R_stamp) +LOCAL_ADDITIONAL_DEPENDENCIES := $(lineage_framework_res_R_stamp) $(lineage_framework_module): | $(dir $(lineage_framework_module))org.lineageos.platform-res.apk @@ -137,9 +136,7 @@ LOCAL_JAVA_LIBRARIES := \ # the source for this library. lineage_framework_res_R_stamp := \ $(call intermediates-dir-for,APPS,org.lineageos.platform-res,,COMMON)/src/R.stamp -$(full_classes_compiled_jar): $(lineage_framework_res_R_stamp) -$(built_dex_intermediate): $(lineage_framework_res_R_stamp) -$(full_target): $(lineage_framework_built) $(gen) +LOCAL_ADDITIONAL_DEPENDENCIES := $(lineage_framework_res_R_stamp) include $(BUILD_STATIC_JAVA_LIBRARY) # the sdk as an aar for publish, not built as part of full target