diff options
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/product_config.mk | 2 | ||||
-rw-r--r-- | target/board/generic/sepolicy/property_contexts | 2 | ||||
-rw-r--r-- | target/product/core.mk | 1 | ||||
-rw-r--r-- | target/product/core_tiny.mk | 1 | ||||
-rw-r--r-- | target/product/sdk_phone_arm64.mk | 2 | ||||
-rw-r--r-- | target/product/sdk_phone_armv7.mk | 2 | ||||
-rw-r--r-- | target/product/sdk_phone_mips.mk | 2 | ||||
-rw-r--r-- | target/product/sdk_phone_mips64.mk | 2 | ||||
-rw-r--r-- | target/product/sdk_phone_x86.mk | 2 | ||||
-rw-r--r-- | target/product/sdk_phone_x86_64.mk | 2 | ||||
-rw-r--r-- | tools/releasetools/common.py | 23 | ||||
-rw-r--r-- | tools/releasetools/sparse_img.py | 26 |
13 files changed, 50 insertions, 19 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index e57fdb2..c2f0b28 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MMB29V +export BUILD_ID=MHC19J diff --git a/core/product_config.mk b/core/product_config.mk index 54050b4..259d983 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -117,7 +117,7 @@ ifdef product_goals # which really means TARGET_PRODUCT=dream make installclean. ifneq ($(filter-out $(INTERNAL_VALID_VARIANTS),$(TARGET_BUILD_VARIANT)),) MAKECMDGOALS := $(MAKECMDGOALS) $(TARGET_BUILD_VARIANT) - TARGET_BUILD_VARIANT := eng + TARGET_BUILD_VARIANT := userdebug default_goal_substitution := else default_goal_substitution := $(DEFAULT_GOAL) diff --git a/target/board/generic/sepolicy/property_contexts b/target/board/generic/sepolicy/property_contexts index 09b9b06..a0a4020 100644 --- a/target/board/generic/sepolicy/property_contexts +++ b/target/board/generic/sepolicy/property_contexts @@ -1,2 +1,4 @@ qemu. u:object_r:qemu_prop:s0 +emu. u:object_r:qemu_prop:s0 +emulator. u:object_r:qemu_prop:s0 radio.noril u:object_r:radio_noril_prop:s0 diff --git a/target/product/core.mk b/target/product/core.mk index 3af85af..c340acd 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \ DownloadProviderUi \ Email \ ExactCalculator \ - Exchange2 \ ExternalStorageProvider \ FusedLocation \ InputDevices \ diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index 9684b11..31e2ae3 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -58,6 +58,7 @@ PRODUCT_PACKAGES += \ javax.btobex \ keystore \ keystore.default \ + ld.mc \ libOpenMAXAL \ libOpenSLES \ libdownmix \ diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index a0cf6c1..1d13b9e 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -24,7 +24,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) # Overrides -PRODUCT_BRAND := generic_arm64 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_arm64 PRODUCT_DEVICE := generic_arm64 PRODUCT_MODEL := Android SDK built for arm64 diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index aeb4940..a0fa049 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -17,6 +17,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_armv7 PRODUCT_DEVICE := generic diff --git a/target/product/sdk_phone_mips.mk b/target/product/sdk_phone_mips.mk index 818491f..d7217a0 100644 --- a/target/product/sdk_phone_mips.mk +++ b/target/product/sdk_phone_mips.mk @@ -22,7 +22,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_mips +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_mips PRODUCT_DEVICE := generic_mips PRODUCT_MODEL := Android SDK for Mips diff --git a/target/product/sdk_phone_mips64.mk b/target/product/sdk_phone_mips64.mk index afdb2a8..8ddcb58 100644 --- a/target/product/sdk_phone_mips64.mk +++ b/target/product/sdk_phone_mips64.mk @@ -23,7 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_mips64 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_mips64 PRODUCT_DEVICE := generic_mips64 PRODUCT_MODEL := Android SDK built for mips64 diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 95c49ab..a58d26f 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -22,7 +22,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_x86 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86 PRODUCT_DEVICE := generic_x86 PRODUCT_MODEL := Android SDK built for x86 diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 69e37af..c39b274 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -23,7 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_x86_64 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86_64 PRODUCT_DEVICE := generic_x86_64 PRODUCT_MODEL := Android SDK built for x86_64 diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index cd35023..26cc674 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1490,18 +1490,27 @@ fi 'bonus_args': bonus_args} # The install script location moved from /system/etc to /system/bin - # in the L release. Parse the init.rc file to find out where the + # in the L release. Parse init.*.rc files to find out where the # target-files expects it to be, and put it there. sh_location = "etc/install-recovery.sh" - try: - with open(os.path.join(input_dir, "BOOT", "RAMDISK", "init.rc")) as f: + found = False + init_rc_dir = os.path.join(input_dir, "BOOT", "RAMDISK") + init_rc_files = os.listdir(init_rc_dir) + for init_rc_file in init_rc_files: + if (not init_rc_file.startswith('init.') or + not init_rc_file.endswith('.rc')): + continue + + with open(os.path.join(init_rc_dir, init_rc_file)) as f: for line in f: m = re.match(r"^service flash_recovery /system/(\S+)\s*$", line) if m: sh_location = m.group(1) - print("putting script in", sh_location) + found = True break - except (OSError, IOError) as e: - print("failed to read init.rc: %s" % e) + if found: + break + + print("putting script in", sh_location) - output_sink(sh_location, sh)
\ No newline at end of file + output_sink(sh_location, sh) diff --git a/tools/releasetools/sparse_img.py b/tools/releasetools/sparse_img.py index 10022d0..fa4406c 100644 --- a/tools/releasetools/sparse_img.py +++ b/tools/releasetools/sparse_img.py @@ -212,6 +212,16 @@ class SparseImage(object): nonzero_blocks = [] reference = '\0' * self.blocksize + # Workaround for bug 23227672. For squashfs, we don't have a system.map. So + # the whole system image will be treated as a single file. But for some + # unknown bug, the updater will be killed due to OOM when writing back the + # patched image to flash (observed on lenok-userdebug MEA49). Prior to + # getting a real fix, we evenly divide the non-zero blocks into smaller + # groups (currently 1024 blocks or 4MB per group). + # Bug: 23227672 + MAX_BLOCKS_PER_GROUP = 1024 + nonzero_groups = [] + f = self.simg_f for s, e in remaining: for b in range(s, e): @@ -234,12 +244,22 @@ class SparseImage(object): nonzero_blocks.append(b) nonzero_blocks.append(b+1) - assert zero_blocks or nonzero_blocks or clobbered_blocks + if len(nonzero_blocks) >= MAX_BLOCKS_PER_GROUP: + nonzero_groups.append(nonzero_blocks) + # Clear the list. + nonzero_blocks = [] + + if nonzero_blocks: + nonzero_groups.append(nonzero_blocks) + nonzero_blocks = [] + + assert zero_blocks or nonzero_groups or clobbered_blocks if zero_blocks: out["__ZERO"] = rangelib.RangeSet(data=zero_blocks) - if nonzero_blocks: - out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks) + if nonzero_groups: + for i, blocks in enumerate(nonzero_groups): + out["__NONZERO-%d" % i] = rangelib.RangeSet(data=blocks) if clobbered_blocks: out["__COPY"] = clobbered_blocks |