LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Revert "Copy sdk-classes.jar to classes-header.jar for turbine.""

Browse Source
This commit is contained in:
Nan Zhang
2017-08-31 20:32:46 +00:00
committed by Gerrit Code Review
parent 4737f82861 d84fe4b34f
commit 73140948c7
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build/build_android_stubs.mk
View File

@@ -19,7 +19,6 @@
# resource files here. # resource files here.
intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(sdk_stub_name)_intermediates intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(sdk_stub_name)_intermediates
full_target := $(intermediates)/classes.jar full_target := $(intermediates)/classes.jar
header_target := $(intermediates)/classes-header.jar
jack_lib := $(intermediates)/classes.jack jack_lib := $(intermediates)/classes.jack
dex_toc := $(intermediates)/classes.dex.toc dex_toc := $(intermediates)/classes.dex.toc
full_src_target = $(intermediates)/android-stubs-src.jar full_src_target = $(intermediates)/android-stubs-src.jar
@@ -37,7 +36,7 @@ $(full_src_target): $(stub_timestamp)
@echo Packaging SDK Stub sources: $@ @echo Packaging SDK Stub sources: $@
$(hide) cd $(PRIVATE_INTERMEDIATES_DIR) && zip -rq $(notdir $@) $(notdir $(PRIVATE_SRC_DIR)) $(hide) cd $(PRIVATE_INTERMEDIATES_DIR) && zip -rq $(notdir $@) $(notdir $(PRIVATE_SRC_DIR))
$(full_target): $(stub_timestamp) $(framework_res_package) $(ZIPTIME) $(full_target): $(stub_timestamp) $(framework_res_package)
@echo Compiling SDK Stubs: $@ @echo Compiling SDK Stubs: $@
$(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR)
$(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR)
@@ -68,12 +67,8 @@ $(full_target): $(stub_timestamp) $(framework_res_package) $(ZIPTIME)
$(hide) unzip -qo $(PRIVATE_FRAMEWORK_RES_PACKAGE) -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(hide) unzip -qo $(PRIVATE_FRAMEWORK_RES_PACKAGE) -d $(PRIVATE_CLASS_INTERMEDIATES_DIR)
$(hide) (cd $(PRIVATE_CLASS_INTERMEDIATES_DIR) && rm -rf classes.dex META-INF) $(hide) (cd $(PRIVATE_CLASS_INTERMEDIATES_DIR) && rm -rf classes.dex META-INF)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) jar -cf $@.tmp -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) . $(hide) jar -cf $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) .
$(hide) jar -u0f $@.tmp -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) resources.arsc $(hide) jar -u0f $@ -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) resources.arsc
$(hide) $(ZIPTIME) $@.tmp
$(hide) $(call commit-change-for-toc,$@)
.KATI_RESTAT: $(full_target)
$(jack_lib) : $(stub_timestamp) $(framework_res_package) $(JACK_DEFAULT_ARGS) $(JACK) | setup-jack-server $(jack_lib) : $(stub_timestamp) $(framework_res_package) $(JACK_DEFAULT_ARGS) $(JACK) | setup-jack-server
@echo Compiling SDK Stubs with Jack: $@ @echo Compiling SDK Stubs with Jack: $@
@@ -96,7 +91,7 @@ $(jack_lib) : $(stub_timestamp) $(framework_res_package) $(JACK_DEFAULT_ARGS) $(
|| ( rm -f $@ ; $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp ; exit 41 ) || ( rm -f $@ ; $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp ; exit 41 )
$(hide) rm -rf $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp $(hide) rm -rf $(PRIVATE_INTERMEDIATES_DIR)/jack-rsc.tmp
$(eval $(call copy-one-file,$(full_target),$(header_target))) $(call define-jar-to-toc-rule, $(full_target))
# As we don't have .dex file for the SDK stub, we cannot generate .toc # As we don't have .dex file for the SDK stub, we cannot generate .toc
# file from .dex file. Use .toc file generated from .jar instead. # file from .dex file. Use .toc file generated from .jar instead.