diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-06 07:24:30 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-06 07:28:25 +0000 |
| commit | b745f4d9bff791ddfeee8046e2c62ee52ad0537a (patch) | |
| tree | 5b1f55bddb202faeca67b42dfb42f71189cc3552 | |
| parent | b106cda0b83bf4e98876364d1305d429cc80fdbf (diff) | |
| parent | b2a5515585edfb0b0adbf60f99e06c0ad2dd1d75 (diff) | |
| download | build-b745f4d9bff791ddfeee8046e2c62ee52ad0537a.tar.gz | |
Make change and version bump to PPR1.180606.001
Change-Id: I604a5d3f995c308c1912ba7c72677b41073bc31f
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | target/board/generic/BoardConfig.mk | 29 | ||||
| -rw-r--r-- | target/product/sdk_phone_x86.mk | 4 | ||||
| -rw-r--r-- | target/product/sdk_phone_x86_64.mk | 4 |
4 files changed, 30 insertions, 9 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index ea7977238d..6d88c08e27 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=PPR1.180605.002 +export BUILD_ID=PPR1.180606.001 diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 2a1c45fdd3..009fb32249 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -8,18 +8,31 @@ TARGET_NO_BOOTLOADER := true TARGET_NO_KERNEL := true TARGET_ARCH := arm -# Note: we build the platform images for ARMv7-A _without_ NEON. +# Note: Before Pi, we built the platform images for ARMv7-A _without_ NEON. # -# Technically, the emulator supports ARMv7-A _and_ NEON instructions, but -# emulated NEON code paths typically ends up 2x slower than the normal C code -# it is supposed to replace (unlike on real devices where it is 2x to 3x -# faster). +ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk,$(MAKECMDGOALS)),) +# DO NOT USE # -# What this means is that the platform image will not use NEON code paths -# that are slower to emulate. On the other hand, it is possible to emulate -# application code generated with the NDK that uses NEON in the emulator. +# This architecture variant should NOT be used for 32 bit arm platform +# builds. It is the lowest common denominator required to build +# an unbundled application for all supported 32 platforms. +# cts for 32 bit arm is built using aosp_arm64 product. # +# If you are building a 32 bit platform (and not an application), +# you should set the following as 2nd arch variant: +# +# TARGET_ARCH_VARIANT := armv7-a-neon +# +# DO NOT USE TARGET_ARCH_VARIANT := armv7-a +# DO NOT USE +else +# Starting from Pi, System image of aosp_arm products is the new GSI +# for real devices newly launched for Pi. These devices are usualy not +# as performant as the mainstream 64-bit devices and the performance +# provided by NEON is important for them to pass related CTS tests. +TARGET_ARCH_VARIANT := armv7-a-neon +endif TARGET_CPU_VARIANT := generic TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 6423625b4e..b34e5b6dc2 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -16,6 +16,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) +# Define the host tools and libs that are parts of the SDK. +-include sdk/build/product_sdk.mk +-include development/build/product_sdk.mk + # Overrides PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86 diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index bffbc7bf91..37c078e7cc 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -16,6 +16,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) +# Define the host tools and libs that are parts of the SDK. +-include sdk/build/product_sdk.mk +-include development/build/product_sdk.mk + # Overrides PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86_64 |