tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Export app implementation and header jars" am: 1ea9c644c8 am: e0beddc068

Browse source 
am: 6a825da3d9

Change-Id: I537f3db41b807b65d912050c205202378efd5c7e
This commit is contained in:
Colin Cross 2017-12-16 00:21:56 +00:00 committed by android-build-merger
commit d19ebde198
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/clear_vars.mk
View file

@ -231,8 +231,9 @@ LOCAL_SDK_RES_VERSION:=
LOCAL_SDK_VERSION:= LOCAL_SDK_VERSION:=
LOCAL_SHARED_ANDROID_LIBRARIES:= LOCAL_SHARED_ANDROID_LIBRARIES:=
LOCAL_SHARED_LIBRARIES:= LOCAL_SHARED_LIBRARIES:=
LOCAL_SOONG_HEADER_JAR := LOCAL_SOONG_CLASSES_JAR :=
LOCAL_SOONG_DEX_JAR := LOCAL_SOONG_DEX_JAR :=
LOCAL_SOONG_HEADER_JAR :=
LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR := LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE := LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
LOCAL_SOONG_RRO_DIRS := LOCAL_SOONG_RRO_DIRS :=

18
core/soong_app_prebuilt.mk
View file

@ -16,8 +16,26 @@ include $(BUILD_SYSTEM)/base_rules.mk
ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\ $(eval $(call copy-one-file,$(LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR),\
$(intermediates.COMMON)/jacoco-report-classes.jar)) $(intermediates.COMMON)/jacoco-report-classes.jar))
$(call add-dependency,$(common_javalib.jar),\
$(intermediates.COMMON)/jacoco-report-classes.jar)
endif endif
full_classes_jar := $(intermediates.COMMON)/classes.jar
full_classes_pre_proguard_jar := $(intermediates.COMMON)/classes-pre-proguard.jar
full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar
$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))
$(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))
ifneq ($(TURBINE_DISABLED),false)
ifdef LOCAL_SOONG_HEADER_JAR
$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
else
$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
endif
endif # TURBINE_DISABLED != false
$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE ifdef LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE