From e0cedf4f4baf57a1970c126f228df92163ed1211 Mon Sep 17 00:00:00 2001 From: Sam Lin Date: Mon, 8 Jun 2020 20:47:46 +0000 Subject: Add an aosp car target that supports 64-bit apps only Bug: 168796046 Test: adb shell getprop | grep abi Test: Output should be Test: [ro.product.cpu.abi]: [x86_64] [ro.product.cpu.abilist]: [x86_64] [ro.product.cpu.abilist32]: [] [ro.product.cpu.abilist64]: [x86_64] Change-Id: I5f8bed37f368d2346c0e88bd1a4f03cc66270979 --- AndroidProducts.mk | 2 ++ aosp_car_x86_64_app.mk | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 aosp_car_x86_64_app.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index ff095c2..920a0b0 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -19,6 +19,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_car_arm.mk \ $(LOCAL_DIR)/aosp_car_x86.mk \ $(LOCAL_DIR)/aosp_car_x86_64.mk \ + $(LOCAL_DIR)/aosp_car_x86_64_app.mk \ $(LOCAL_DIR)/car_x86_64.mk \ COMMON_LUNCH_CHOICES := \ @@ -26,6 +27,7 @@ COMMON_LUNCH_CHOICES := \ aosp_car_arm64-userdebug \ aosp_car_x86-userdebug \ aosp_car_x86_64-userdebug \ + aosp_car_x86_64_app-userdebug \ car_x86_64-userdebug \ EMULATOR_VENDOR_NO_SOUND_TRIGGER := false diff --git a/aosp_car_x86_64_app.mk b/aosp_car_x86_64_app.mk new file mode 100644 index 0000000..65a8e58 --- /dev/null +++ b/aosp_car_x86_64_app.mk @@ -0,0 +1,23 @@ +# +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +$(call inherit-product, device/generic/car/common/car.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_64bitonly_x86_64.mk) + +# This build configuration supports 64-bit apps only +PRODUCT_NAME := aosp_car_x86_64_app +PRODUCT_DEVICE := generic_64bitonly_x86_64 +PRODUCT_BRAND := Android +PRODUCT_MODEL := Car on x86_64 64-bit app only emulator -- cgit v1.2.3