StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp"""

Browse Source 
am: 9379de6756

Change-Id: Ibe57c92bbccbc8f8b9bdf87f87cca32880a3073c
This commit is contained in:
Bo Hu
2018-06-20 01:14:00 -07:00
committed by android-build-merger
parent 31e612afb3 9379de6756
commit c2c164504d
2 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
target/product/sdk_phone_arm64.mk
View File

@@ -14,31 +14,15 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_PROPERTY_OVERRIDES += \ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
rild.libpath=/vendor/lib64/libreference-ril.so
# This is a build configuration for a full-featured build of the # Define the host tools and libs that are parts of the SDK.
# Open-Source part of the tree. It's geared toward a US-centric $(call inherit-product, sdk/build/product_sdk.mk)
# build quite specifically for the emulator, and might not be $(call inherit-product, development/build/product_sdk.mk)
# entirely appropriate to inherit from for on-device configurations.
# Note: the following lines need to stay at the beginning so that it can # keep this apk for sdk targets for now
# 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 += \ PRODUCT_PACKAGES += \
messaging EmulatorSmokeTests
# Overrides # Overrides
PRODUCT_BRAND := Android PRODUCT_BRAND := Android

22
target/product/sdk_phone_armv7.mk
View File

@@ -14,24 +14,16 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_PROPERTY_OVERRIDES += \ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
rild.libpath=/vendor/lib/libreference-ril.so
# Note: the following lines need to stay at the beginning so that it can # Define the host tools and libs that are parts of the SDK.
# take priority and override the rules it inherit from other mk files $(call inherit-product, sdk/build/product_sdk.mk)
# see copy file rules in core/Makefile $(call inherit-product, development/build/product_sdk.mk)
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) # keep this apk for sdk targets for now
# 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 += \ PRODUCT_PACKAGES += \
messaging EmulatorSmokeTests
# Overrides # Overrides
PRODUCT_BRAND := Android PRODUCT_BRAND := Android