Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing dependency on R.java

Browse Source 
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
This commit is contained in:
Colin Cross
2017-10-11 21:34:17 -07:00
committed by Sam Mortimer
parent f0a4544b5e
commit 3276a6baa3
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Android.mk
View File

@@ -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