diff options
| author | bohu <bohu@google.com> | 2018-06-04 14:11:55 -0700 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2018-06-04 14:11:55 -0700 |
| commit | c5e25e9b84ac24a5f6467c9c830fee0b50df0e61 (patch) | |
| tree | 76427e2ee1738e682315daffc167a632cc7e9279 | |
| parent | cd428970252dbe6a1ba8a576a99c35e33d69b566 (diff) | |
| download | build-c5e25e9b84ac24a5f6467c9c830fee0b50df0e61.tar.gz | |
emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736
this cl only impacts emulator images
Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
| -rw-r--r-- | target/product/sdk_phone_x86.mk | 20 | ||||
| -rw-r--r-- | target/product/sdk_phone_x86_64.mk | 22 |
2 files changed, 2 insertions, 40 deletions
diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 9bbf9b43ff..6423625b4e 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -14,25 +14,7 @@ # limitations under the License. # -PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib/libreference-ril.so - -# 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. -PRODUCT_COPY_FILES += \ - development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ - device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu-64 - -$(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 +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) # Overrides PRODUCT_BRAND := Android diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 25b0d0386d..bffbc7bf91 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -14,27 +14,7 @@ # limitations under the License. # -PRODUCT_PROPERTY_OVERRIDES += \ - rild.libpath=/vendor/lib64/libreference-ril.so - -# 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. - -PRODUCT_COPY_FILES += \ - development/sys-img/advancedFeatures.ini:advancedFeatures.ini \ - device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \ - prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(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 +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) # Overrides PRODUCT_BRAND := Android |