From c82af2f6a9ab5facd9a4736e3a402e64bd81c3c3 Mon Sep 17 00:00:00 2001 From: Bo Hu Date: Tue, 19 Jun 2018 22:19:47 +0000 Subject: [PATCH] Revert "emulator: base sdk_phone_armv7/64 on aosp" This reverts commit b12abf031017edb77d2a8e168765e5b4ccc3e9b4. Reason for revert: broke sdk build Change-Id: Ib04df196806488245259f797eb9f52e61f337715 --- target/product/sdk_phone_arm64.mk | 28 ++++++++++++++++++++++++---- target/product/sdk_phone_armv7.mk | 20 ++++++++++++++++---- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index c6b290f796..56eb8c7911 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -14,11 +14,31 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk) +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib64/libreference-ril.so -# Define the host tools and libs that are parts of the SDK. -$(call inherit-product, sdk/build/product_sdk.mk) -$(call inherit-product, development/build/product_sdk.mk) +# This is a build configuration for a full-featured build of the +# Open-Source part of the tree. It's geared toward a US-centric +# build quite specifically for the emulator, and might not be +# entirely appropriate to inherit from for on-device configurations. + +# Note: the following lines need to stay at the beginning so that it can +# take priority and override the rules it inherit from other mk files +# see copy file rules in core/Makefile +PRODUCT_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ + prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu \ + device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu + +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) + +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk +PRODUCT_PACKAGES += \ + messaging # Overrides PRODUCT_BRAND := Android diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index f2b51cfd70..73c42c381d 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -14,12 +14,24 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk) +PRODUCT_PROPERTY_OVERRIDES += \ + rild.libpath=/vendor/lib/libreference-ril.so -# Define the host tools and libs that are parts of the SDK. -$(call inherit-product, sdk/build/product_sdk.mk) -$(call inherit-product, development/build/product_sdk.mk) +# Note: the following lines need to stay at the beginning so that it can +# take priority and override the rules it inherit from other mk files +# see copy file rules in core/Makefile +PRODUCT_COPY_FILES += \ + development/sys-img/advancedFeatures.ini.arm:advancedFeatures.ini \ + prebuilts/qemu-kernel/arm64/3.18/kernel-qemu2:kernel-ranchu-64 \ + device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu +$(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) + +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk +PRODUCT_PACKAGES += \ + messaging # Overrides PRODUCT_BRAND := Android