diff options
| author | Michael Runge <mrunge@google.com> | 2013-07-22 21:57:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-22 21:57:00 +0000 |
| commit | 065ab7f0df5c7181be0af3ed9f268cac50bca410 (patch) | |
| tree | e4c4f9a9c2969965fd950b8a26d3a36967eebb40 /core | |
| parent | 9232a62e9887f6bc2590e108063c6fd7bfa1feda (diff) | |
| parent | fb9bb205fcda6544cf5ec5d84cc1e5935ae96935 (diff) | |
| download | build-065ab7f0df5c7181be0af3ed9f268cac50bca410.tar.gz build-065ab7f0df5c7181be0af3ed9f268cac50bca410.tar.bz2 build-065ab7f0df5c7181be0af3ed9f268cac50bca410.zip | |
Merge "Revert "Update OTA to understand SELinux filesystem labels""
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile index 171936f09..eb02ff454 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1147,7 +1147,6 @@ $(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 \ @@ -1239,9 +1238,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 -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) 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) (cd $(zip_root) && zip -q ../$(notdir $@) META/*filesystem_config.txt) .PHONY: target-files-package |