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

Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."

Browse source
This commit is contained in:
Dan Albert 2015-03-13 20:44:08 +00:00 committed by Gerrit Code Review
commit 137b049aef
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/Makefile
View file

@ -1270,16 +1270,19 @@ $(BUILT_OTATOOLS_PACKAGE): \
$(BUILT_OTATOOLS_PACKAGE): \ $(BUILT_OTATOOLS_PACKAGE): \
zip_root := $(intermediate)/otatools zip_root := $(intermediate)/otatools
otatools_lib_path := $(notdir $(HOST_OUT_SHARED_LIBRARIES))
$(BUILT_OTATOOLS_PACKAGE): \ $(BUILT_OTATOOLS_PACKAGE): \
$(OTATOOLS) $(OTATOOLS) \
$(HOST_OUT_SHARED_LIBRARIES)/libc++.so
@echo "Package OTA tools: $@" @echo "Package OTA tools: $@"
$(hide) rm -rf $@ $(zip_root) $(hide) rm -rf $@ $(zip_root)
$(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools $(zip_root)/$(otatools_lib_path)
$(hide) $(ACP) -p $(OTATOOLS) $(zip_root)/bin $(hide) $(ACP) -p $(OTATOOLS) $(zip_root)/bin
$(hide) mv $(zip_root)/bin/*.jar $(zip_root)/framework/ $(hide) mv $(zip_root)/bin/*.jar $(zip_root)/framework/
$(hide) $(ACP) $(HOST_OUT_SHARED_LIBRARIES)/libc++.so $(zip_root)/$(otatools_lib_path)
$(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools $(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools
$(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc $(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc
$(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools) $(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools $(otatools_lib_path))
$(hide) zip -qry $(abspath $@) build/target/product/security/ $(hide) zip -qry $(abspath $@) build/target/product/security/
$(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem | xargs zip -qry $(abspath $@) $(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem | xargs zip -qry $(abspath $@)