diff options
Diffstat (limited to 'core/soong_app_prebuilt.mk')
-rw-r--r-- | core/soong_app_prebuilt.mk | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index c50df07f4..f7236335b 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk | |||
@@ -27,22 +27,8 @@ full_classes_jar := $(intermediates.COMMON)/classes.jar | |||
27 | full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar | 27 | full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar |
28 | full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar | 28 | full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar |
29 | 29 | ||
30 | ifdef LOCAL_SOONG_CLASSES_JAR | 30 | $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar))) |
31 | $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar))) | 31 | $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar))) |
32 | $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar))) | ||
33 | $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar))) | ||
34 | |||
35 | ifneq ($(TURBINE_ENABLED),false) | ||
36 | ifdef LOCAL_SOONG_HEADER_JAR | ||
37 | $(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar))) | ||
38 | $(eval $(call add-dependency,$(full_classes_jar),$(full_classes_header_jar))) | ||
39 | else | ||
40 | $(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar))) | ||
41 | endif | ||
42 | endif # TURBINE_ENABLED != false | ||
43 | endif | ||
44 | |||
45 | $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) | ||
46 | 32 | ||
47 | ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR | 33 | ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR |
48 | $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\ | 34 | $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\ |
@@ -58,6 +44,15 @@ ifdef LOCAL_SOONG_PROGUARD_DICT | |||
58 | $(intermediates.COMMON)/proguard_dictionary) | 44 | $(intermediates.COMMON)/proguard_dictionary) |
59 | endif | 45 | endif |
60 | 46 | ||
47 | ifneq ($(TURBINE_ENABLED),false) | ||
48 | ifdef LOCAL_SOONG_HEADER_JAR | ||
49 | $(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar))) | ||
50 | else | ||
51 | $(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar))) | ||
52 | endif | ||
53 | endif # TURBINE_ENABLED != false | ||
54 | |||
55 | |||
61 | ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE | 56 | ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE |
62 | resource_export_package := $(intermediates.COMMON)/package-export.apk | 57 | resource_export_package := $(intermediates.COMMON)/package-export.apk |
63 | resource_export_stamp := $(intermediates.COMMON)/src/R.stamp | 58 | resource_export_stamp := $(intermediates.COMMON)/src/R.stamp |
@@ -79,6 +74,8 @@ ifneq ($(BUILD_PLATFORM_ZIP),) | |||
79 | $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk)) | 74 | $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk)) |
80 | endif | 75 | endif |
81 | 76 | ||
77 | $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) | ||
78 | |||
82 | my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\ | 79 | my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\ |
83 | $(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f))) | 80 | $(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f))) |
84 | my_installed := $(call copy-many-files, $(my_built_installed)) | 81 | my_installed := $(call copy-many-files, $(my_built_installed)) |