diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-13 20:44:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-13 20:44:09 +0000 |
| commit | 137b049aef6ffc1de1340657ecf9208303ec1872 (patch) | |
| tree | 69963f36aec7295a8339d6a0250b3c712ced24b0 | |
| parent | 4cdf1357433b407b350517779248e2194c88c3f4 (diff) | |
| parent | f749b4b66494dae442ab1174c3b1db35ed1df1a8 (diff) | |
| download | build-137b049aef6ffc1de1340657ecf9208303ec1872.zip build-137b049aef6ffc1de1340657ecf9208303ec1872.tar.gz build-137b049aef6ffc1de1340657ecf9208303ec1872.tar.bz2 | |
Merge "DO NOT MERGE: Bundle libc++.so into otatools-package."
| -rw-r--r-- | core/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 16e511d..a192e43 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1270,16 +1270,19 @@ $(BUILT_OTATOOLS_PACKAGE): \ $(BUILT_OTATOOLS_PACKAGE): \ zip_root := $(intermediate)/otatools +otatools_lib_path := $(notdir $(HOST_OUT_SHARED_LIBRARIES)) $(BUILT_OTATOOLS_PACKAGE): \ - $(OTATOOLS) + $(OTATOOLS) \ + $(HOST_OUT_SHARED_LIBRARIES)/libc++.so @echo "Package OTA tools: $@" $(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) 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) 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) find device vendor -name \*.pk8 -o -name \*.x509.pem | xargs zip -qry $(abspath $@) |