diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2015-03-10 18:58:23 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-06 18:45:47 -0700 |
| commit | 66318060057614637d435fe43e6397f45cd550db (patch) | |
| tree | 6e3bebed80f35a50fa933426ce5f7e5417abe2d8 | |
| parent | c064d16d71cf5c421ea1948b5b14b726fa3070e2 (diff) | |
| download | build-66318060057614637d435fe43e6397f45cd550db.zip build-66318060057614637d435fe43e6397f45cd550db.tar.gz build-66318060057614637d435fe43e6397f45cd550db.tar.bz2 | |
build: Update install tools packaging for target-files support
Modifies "build: ota: Support for install tools in /tmp/install" to
support signing steps being split from build steps.
Package install files into target-files INSTALL path
Read from target-files for OTA package creation
Change-Id: I64f919c2a757b5474f6cc5f82bd6c33c2a8b558a
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rwxr-xr-x | tools/releasetools/ota_from_target_files | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile index 8f16666..2ed5527 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1516,6 +1516,8 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(hide) mkdir -p $(zip_root)/RECOVERY $(hide) $(call package_files-copy-root, \ $(TARGET_RECOVERY_ROOT_OUT),$(zip_root)/RECOVERY/RAMDISK) + @# OTA install helpers + $(hide) $(call package_files-copy-root, $(OUT)/install, $(zip_root)/INSTALL) ifdef INSTALLED_KERNEL_TARGET $(hide) $(ACP) $(INSTALLED_KERNEL_TARGET) $(zip_root)/RECOVERY/kernel endif diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index e0fc128..3f06f40 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -501,13 +501,12 @@ def GetImage(which, tmpdir, info_dict): def CopyInstallTools(output_zip): - oldcwd = os.getcwd() - os.chdir(os.getenv('OUT')) - for root, subdirs, files in os.walk("install"): + install_path = os.path.join(OPTIONS.input_tmp, "INSTALL") + for root, subdirs, files in os.walk(install_path): for f in files: - p = os.path.join(root, f) - output_zip.write(p, p) - os.chdir(oldcwd) + install_source = os.path.join(root, f) + install_target = os.path.join("install", os.path.relpath(root, install_path), f) + output_zip.write(install_source, install_target) def WriteFullOTAPackage(input_zip, output_zip): |