diff options
| author | Nick Kralevich <nnk@google.com> | 2013-07-18 22:25:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-18 22:25:59 +0000 |
| commit | f771d64bcb2427c0496cfd561712f69f05ec7521 (patch) | |
| tree | 6394a679dcd6890a868dd8ecead57cdb72b23042 /core | |
| parent | 4e361bf6920f15b30828c002d9641f783f20f279 (diff) | |
| parent | fbbd79530adc6ddd6bbfb3c5fc60ba5ec0ce5f2d (diff) | |
| download | build-f771d64bcb2427c0496cfd561712f69f05ec7521.tar.gz build-f771d64bcb2427c0496cfd561712f69f05ec7521.tar.bz2 build-f771d64bcb2427c0496cfd561712f69f05ec7521.zip | |
Merge "Update OTA to understand SELinux filesystem labels"
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index eb02ff454..171936f09 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1147,6 +1147,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(INSTALLED_CACHEIMAGE_TARGET) \ $(INSTALLED_VENDORIMAGE_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ + $(SELINUX_FC) \ $(built_ota_tools) \ $(APKCERTS_FILE) \ $(HOST_OUT_EXECUTABLES)/fs_config \ @@ -1238,9 +1239,9 @@ endif @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) @# Run fs_config on all the system, boot ramdisk, and recovery ramdisk files in the zip, and save the output - $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="SYSTEM/" } /^SYSTEM\// {print "system/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config > $(zip_root)/META/filesystem_config.txt - $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="BOOT/RAMDISK/" } /^BOOT\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config > $(zip_root)/META/boot_filesystem_config.txt - $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config > $(zip_root)/META/recovery_filesystem_config.txt + $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="SYSTEM/" } /^SYSTEM\// {print "system/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -S $(SELINUX_FC) > $(zip_root)/META/filesystem_config.txt + $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="BOOT/RAMDISK/" } /^BOOT\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -S $(SELINUX_FC) > $(zip_root)/META/boot_filesystem_config.txt + $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -S $(SELINUX_FC) > $(zip_root)/META/recovery_filesystem_config.txt $(hide) (cd $(zip_root) && zip -q ../$(notdir $@) META/*filesystem_config.txt) .PHONY: target-files-package |