resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp

Bug: 29278988

Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d

diff --cc core/Makefile
index facdc79,a3bdc3a..78bad4f
--- 1/core/Makefile
--- 2/core/Makefile
+++ b/core/Makefile
@@@ -1951,9 -1892,12 +2010,12 @@@ endi
  ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),)
        $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -D $(TARGET_OUT) -S $(SELINUX_FC) > $(zip_root)/META/recovery_filesystem_config.txt
  endif
+ ifdef INSTALLED_SYSTEMOTHERIMAGE_TARGET
+       $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="SYSTEM_OTHER/" } /^SYSTEM_OTHER\// { print "system/" $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -D $(TARGET_OUT) -S $(SELINUX_FC) > $(zip_root)/META/system_other_filesystem_config.txt
+ endif
        $(hide) (cd $(zip_root) && zip -qX ../$(notdir $@) META/*filesystem_config.txt)
        $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
 -          ./build/tools/releasetools/add_img_to_target_files -v -p $(HOST_OUT) $@
 +          ./build/tools/releasetools/add_img_to_target_files -a -v -p $(HOST_OUT) $@
  
  .PHONY: target-files-package
  target-files-package: $(BUILT_TARGET_FILES_PACKAGE)

diff --cc core/cleanbuild.mk
Simple merge

diff --cc core/dex_preopt.mk
Simple merge

diff --cc core/dex_preopt_libart.mk
Simple merge

diff --cc core/dex_preopt_odex_install.mk
Simple merge

diff --cc core/envsetup.mk
index cdb659a,ce31ddb..422dbef
--- 1/core/envsetup.mk
--- 2/core/envsetup.mk
+++ b/core/envsetup.mk
@@@ -344,21 -323,14 +345,23 @@@ TARGET_OUT_ETC := $(TARGET_OUT)/et
  TARGET_OUT_NOTICE_FILES := $(TARGET_OUT_INTERMEDIATES)/NOTICE_FILES
  TARGET_OUT_FAKE := $(PRODUCT_OUT)/fake_packages
  
+ TARGET_OUT_SYSTEM_OTHER := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM_OTHER)
+ 
  # Out for TARGET_2ND_ARCH
  TARGET_2ND_ARCH_VAR_PREFIX := $(HOST_2ND_ARCH_VAR_PREFIX)
 +ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 +# With this you can reference the arm binary translation library with libfoo_arm in PRODUCT_PACKAGES.
 +TARGET_2ND_ARCH_MODULE_SUFFIX := _$(TARGET_2ND_ARCH)
 +else
  TARGET_2ND_ARCH_MODULE_SUFFIX := $(HOST_2ND_ARCH_MODULE_SUFFIX)
 +endif
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/lib
 +ifeq ($(TARGET_TRANSLATE_2ND_ARCH),true)
 +$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib/$(TARGET_2ND_ARCH)
 +else
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES := $(target_out_shared_libraries_base)/lib
 +endif
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_RENDERSCRIPT_BITCODE := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_SHARED_LIBRARIES)
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_EXECUTABLES := $(TARGET_OUT_EXECUTABLES)
  $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_APPS := $(TARGET_OUT_APPS)

diff --cc core/main.mk
index bd6b163,a612f83..c29a0b4
--- 1/core/main.mk
--- 2/core/main.mk
+++ b/core/main.mk
@@@ -77,8 -80,8 +77,9 @@@ dont_bother_goals := clean clobber data
      stnod systemtarball-nodeps \
      userdataimage-nodeps userdatatarball-nodeps \
      cacheimage-nodeps \
 +    bptimage-nodeps \
      vendorimage-nodeps \
+     systemotherimage-nodeps \
      ramdisk-nodeps \
      bootimage-nodeps \
      recoveryimage-nodeps \
@@@ -938,10 -958,11 +942,12 @@@ droidcore: files 
        $(INSTALLED_RECOVERYIMAGE_TARGET) \
        $(INSTALLED_USERDATAIMAGE_TARGET) \
        $(INSTALLED_CACHEIMAGE_TARGET) \
 +      $(INSTALLED_BPTIMAGE_TARGET) \
        $(INSTALLED_VENDORIMAGE_TARGET) \
+       $(INSTALLED_SYSTEMOTHERIMAGE_TARGET) \
        $(INSTALLED_FILES_FILE) \
-       $(INSTALLED_FILES_FILE_VENDOR)
+       $(INSTALLED_FILES_FILE_VENDOR) \
+       $(INSTALLED_FILES_FILE_SYSTEMOTHER)
  
  # dist_files only for putting your library into the dist directory with a full build.
  .PHONY: dist_files

diff --cc tools/releasetools/add_img_to_target_files.py
Simple merge

diff --cc tools/releasetools/build_image.py
Simple merge