diff options
| author | Narayan Kamath <narayan@google.com> | 2014-06-17 11:11:35 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-06-17 11:11:35 +0100 |
| commit | 9d62dbc53278e1a380053178ead373619eca4a32 (patch) | |
| tree | 6eb94599964c939301747102856f1a020fbc8382 | |
| parent | b75b32830c2e99dae90ab1915e74c1b3ec592e39 (diff) | |
| parent | b60ccd667200d34808f253bdf8d56ea18834006b (diff) | |
| download | build-9d62dbc53278e1a380053178ead373619eca4a32.zip build-9d62dbc53278e1a380053178ead373619eca4a32.tar.gz build-9d62dbc53278e1a380053178ead373619eca4a32.tar.bz2 | |
resolved conflicts for merge of b60ccd66 to master
Change-Id: I731af090c472d70a6c0627cef87239dc6df91645
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | target/product/core_64_bit.mk | 8 | ||||
| -rwxr-xr-x | target/product/full_x86_64.mk | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index ec0533d..6f436ce 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -273,6 +273,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) # ims-common.jar added to BOOTCLASSPATH $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/init.environ.rc_intermediates) +# Change ro.zygote for core_64_bit.mk from zygote32_64 to zygote64_32 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/config.mk b/core/config.mk index d56f1f8..e444635 100644 --- a/core/config.mk +++ b/core/config.mk @@ -254,7 +254,7 @@ endif # # Note that this assumes that the 2ND_CPU_ABI for a 64 bit target # is always 32 bits. If this isn't the case, these variables should -# be overriden in the boarc configuration. +# be overriden in the board configuration. ifeq (,$(TARGET_CPU_ABI_LIST_64_BIT)) ifeq (true|true,$(TARGET_IS_64_BIT)|$(TARGET_SUPPORTS_64_BIT_APPS)) TARGET_CPU_ABI_LIST_64_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 971b6bd..76e2a36 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -22,12 +22,12 @@ # For now this will allow 64-bit apps, but still compile all apps with JNI # for 32-bit only. -# Copy the 32-bit primary, 64-bit secondary zygote startup script -PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc +# Copy the 64-bit primary, 32-bit secondary zygote startup script +PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc -# Set the zygote property to select the 32-bit primary, 64-bit secondary script +# Set the zygote property to select the 64-bit primary, 32-bit secondary script # This line must be parsed before the one in core_minimal.mk -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote32_64 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 TARGET_SUPPORTS_32_BIT_APPS := true TARGET_SUPPORTS_64_BIT_APPS := true diff --git a/target/product/full_x86_64.mk b/target/product/full_x86_64.mk index cd401a8..d9c0c1e 100755 --- a/target/product/full_x86_64.mk +++ b/target/product/full_x86_64.mk @@ -23,10 +23,6 @@ # that isn't a wifi connection. This will instruct init.rc to enable the # network connection so that you can use it with ADB -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 -PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc - - $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) |