summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Hurst <shurst@google.com>2016-06-01 10:35:22 -0700
committerKeun-young Park <keunyoung@google.com>2016-11-28 18:10:38 -0800
commit1435ddcd828cc4e8845ca0f6eeb5ed89f48f58ff (patch)
tree9dd8c5c61cfbccf76ee26e7d6c7b2e04544c6bfa
parent3860a3d5d99bcf628f0bc073590266e936a15907 (diff)
downloaddevice_generic_car-1435ddcd828cc4e8845ca0f6eeb5ed89f48f58ff.tar.gz
device_generic_car-1435ddcd828cc4e8845ca0f6eeb5ed89f48f58ff.tar.bz2
device_generic_car-1435ddcd828cc4e8845ca0f6eeb5ed89f48f58ff.zip
Initial checkin of car arm64 and arm emulator
Bug: 28954017 Change-Id: Ibcbe1367f53a26b23f50489ab1c68ebc9755c6d2
-rw-r--r--car-arm64/AndroidProducts.mk18
-rw-r--r--car-arm64/BoardConfig.mk22
-rw-r--r--car-arm64/car_emulator_arm64.mk46
-rw-r--r--car-arm64/vendorsetup.sh23
-rw-r--r--car-armv7-a-neon/AndroidProducts.mk18
-rw-r--r--car-armv7-a-neon/BoardConfig.mk42
-rw-r--r--car-armv7-a-neon/car_emulator_arm.mk46
-rw-r--r--car-armv7-a-neon/vendorsetup.sh23
-rw-r--r--car-x86_64/car_emulator_x86_64.mk6
-rw-r--r--common/android.hardware.dummy.xml (renamed from car-x86_64/android.hardware.dummy.xml)0
-rw-r--r--common/bootanimations/bootanimation-832.zip (renamed from car-x86_64/bootanimations/bootanimation-832.zip)bin2052281 -> 2052281 bytes
-rw-r--r--common/init.car-emulator.rc (renamed from car-x86_64/init.car-x86_64.rc)0
-rw-r--r--common/preloaded-classes-car (renamed from car-x86_64/preloaded-classes-car)0
13 files changed, 241 insertions, 3 deletions
diff --git a/car-arm64/AndroidProducts.mk b/car-arm64/AndroidProducts.mk
new file mode 100644
index 0000000..7040888
--- /dev/null
+++ b/car-arm64/AndroidProducts.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2016 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.
+#
+
+PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/car_emulator_arm64.mk
diff --git a/car-arm64/BoardConfig.mk b/car-arm64/BoardConfig.mk
new file mode 100644
index 0000000..6cacb44
--- /dev/null
+++ b/car-arm64/BoardConfig.mk
@@ -0,0 +1,22 @@
+# BoardConfig.mk
+#
+# Product-specific compile-time definitions.
+#
+
+include device/generic/arm64/BoardConfig.mk
+
+# Build OpenGLES emulation libraries
+BUILD_EMULATOR := true
+BUILD_EMULATOR_OPENGL := true
+BUILD_EMULATOR_OPENGL_DRIVER := true
+
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
+BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 512
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
+
+BOARD_SEPOLICY_DIRS += \
+ packages/services/Car/car_product/sepolicy
diff --git a/car-arm64/car_emulator_arm64.mk b/car-arm64/car_emulator_arm64.mk
new file mode 100644
index 0000000..fa7df65
--- /dev/null
+++ b/car-arm64/car_emulator_arm64.mk
@@ -0,0 +1,46 @@
+#
+#Copyright (C) 2016 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.
+
+PRODUCT_COPY_FILES += \
+ device/generic/car/common/bootanimations/bootanimation-832.zip:system/media/bootanimation.zip \
+ device/generic/car/common/init.car-emulator.rc:root/init.goldfish.rc
+
+$(call inherit-product, build/target/product/aosp_arm64.mk)
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+PRODUCT_PACKAGE_OVERLAYS := packages/services/Car/car_product/overlay
+
+# Overrides
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Car on ARM emulator
+PRODUCT_NAME := car_emulator_arm64
+PRODUCT_DEVICE := car-arm64
+
+PRODUCT_RESTRICT_VENDOR_FILES := false
+
+PRODUCT_PACKAGES += \
+ vehicle.default
+# Replace framework versions with dummy one, which is essentially
+# the same as removing the xml. Needs this as there is no easy
+# way to remove PRODUCT_COPY_FILES from inherited products.
+PRODUCT_COPY_FILES += \
+ device/generic/car/common/android.hardware.dummy.xml:system/etc/permissions/handheld_core_hardware.xml \
+ packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \
+ packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml \
+ frameworks/native/data/etc/android.hardware.screen.portrait.xml:system/etc/permissions/android.hardware.screen.portrait.xml \
+ frameworks/native/data/etc/android.software.freeform_window_management.xml:system/etc/permissions/android.software.freeform_window_management.xml
+
diff --git a/car-arm64/vendorsetup.sh b/car-arm64/vendorsetup.sh
new file mode 100644
index 0000000..b610cb2
--- /dev/null
+++ b/car-arm64/vendorsetup.sh
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2016 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.
+#
+
+# This file is executed by build/envsetup.sh, and can use anything
+# defined in envsetup.sh.
+#
+# In particular, you can add lunch options with the add_lunch_combo
+# function: add_lunch_combo generic-eng
+
+add_lunch_combo car_emulator_arm64-userdebug
diff --git a/car-armv7-a-neon/AndroidProducts.mk b/car-armv7-a-neon/AndroidProducts.mk
new file mode 100644
index 0000000..86f2ee9
--- /dev/null
+++ b/car-armv7-a-neon/AndroidProducts.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2016 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.
+#
+
+PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/car_emulator_arm.mk
diff --git a/car-armv7-a-neon/BoardConfig.mk b/car-armv7-a-neon/BoardConfig.mk
new file mode 100644
index 0000000..b77d9cc
--- /dev/null
+++ b/car-armv7-a-neon/BoardConfig.mk
@@ -0,0 +1,42 @@
+# BoardConfig.mk
+#
+# Product-specific compile-time definitions.
+#
+
+#include device/generic/armv7-a-neon/BoardConfig.mk
+# The generic product target doesn't have any hardware-specific pieces.
+TARGET_NO_BOOTLOADER := true
+TARGET_NO_KERNEL := true
+TARGET_ARCH := arm
+
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_VARIANT := generic
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+
+SMALLER_FONT_FOOTPRINT := true
+MINIMAL_FONT_FOOTPRINT := true
+# Some framework code requires this to enable BT
+#BOARD_HAVE_BLUETOOTH := true
+#BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
+
+#BOARD_USES_GENERIC_AUDIO := true
+
+#USE_CAMERA_STUB := true
+
+
+# Build OpenGLES emulation libraries
+BUILD_EMULATOR := true
+BUILD_EMULATOR_OPENGL := true
+BUILD_EMULATOR_OPENGL_DRIVER := true
+
+TARGET_USERIMAGES_USE_EXT4 := true
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
+BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
+BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_FLASH_BLOCK_SIZE := 512
+TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
+
+BOARD_SEPOLICY_DIRS += \
+ packages/services/Car/car_product/sepolicy
diff --git a/car-armv7-a-neon/car_emulator_arm.mk b/car-armv7-a-neon/car_emulator_arm.mk
new file mode 100644
index 0000000..c4ade96
--- /dev/null
+++ b/car-armv7-a-neon/car_emulator_arm.mk
@@ -0,0 +1,46 @@
+#
+#Copyright (C) 2016 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.
+
+PRODUCT_COPY_FILES += \
+ device/generic/car/common/bootanimations/bootanimation-832.zip:system/media/bootanimation.zip \
+ device/generic/common/init.car-emulator.rc/init.car-armv7-a-neon.rc:root/init.goldfish.rc
+
+$(call inherit-product, build/target/product/aosp_arm.mk)
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
+PRODUCT_PACKAGE_OVERLAYS := packages/services/Car/car_product/overlay
+
+# Overrides
+PRODUCT_BRAND := google
+PRODUCT_MODEL := Car on ARM emulator
+PRODUCT_NAME := car_emulator_arm
+PRODUCT_DEVICE := car-armv7-a-neon
+
+PRODUCT_RESTRICT_VENDOR_FILES := false
+
+PRODUCT_PACKAGES += \
+ vehicle.default
+# Replace framework versions with dummy one, which is essentially
+# the same as removing the xml. Needs this as there is no easy
+# way to remove PRODUCT_COPY_FILES from inherited products.
+PRODUCT_COPY_FILES += \
+ device/generic/car/common/android.hardware.dummy.xml:system/etc/permissions/handheld_core_hardware.xml \
+ packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \
+ packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc
+
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml \
+ frameworks/native/data/etc/android.hardware.screen.portrait.xml:system/etc/permissions/android.hardware.screen.portrait.xml \
+ frameworks/native/data/etc/android.software.freeform_window_management.xml:system/etc/permissions/android.software.freeform_window_management.xml
+
diff --git a/car-armv7-a-neon/vendorsetup.sh b/car-armv7-a-neon/vendorsetup.sh
new file mode 100644
index 0000000..eed5f78
--- /dev/null
+++ b/car-armv7-a-neon/vendorsetup.sh
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2016 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.
+#
+
+# This file is executed by build/envsetup.sh, and can use anything
+# defined in envsetup.sh.
+#
+# In particular, you can add lunch options with the add_lunch_combo
+# function: add_lunch_combo generic-eng
+
+add_lunch_combo car_emulator_arm-userdebug
diff --git a/car-x86_64/car_emulator_x86_64.mk b/car-x86_64/car_emulator_x86_64.mk
index bab5764..0d224d8 100644
--- a/car-x86_64/car_emulator_x86_64.mk
+++ b/car-x86_64/car_emulator_x86_64.mk
@@ -14,8 +14,8 @@
# limitations under the License.
PRODUCT_COPY_FILES += \
- device/generic/car/car-x86_64/bootanimations/bootanimation-832.zip:system/media/bootanimation.zip \
- device/generic/car/car-x86_64/init.car-x86_64.rc:root/init.goldfish.rc
+ device/generic/car/common/bootanimations/bootanimation-832.zip:system/media/bootanimation.zip \
+ device/generic/car/common/init.car-emulator.rc:root/init.goldfish.rc
$(call inherit-product, build/target/product/aosp_x86_64.mk)
$(call inherit-product, packages/services/Car/car_product/build/car.mk)
@@ -35,7 +35,7 @@ PRODUCT_PACKAGES += \
# the same as removing the xml. Needs this as there is no easy
# way to remove PRODUCT_COPY_FILES from inherited products.
PRODUCT_COPY_FILES += \
- device/generic/car/car-x86_64/android.hardware.dummy.xml:system/etc/permissions/handheld_core_hardware.xml \
+ device/generic/car/common/android.hardware.dummy.xml:system/etc/permissions/handheld_core_hardware.xml \
packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \
packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc
diff --git a/car-x86_64/android.hardware.dummy.xml b/common/android.hardware.dummy.xml
index d66fd14..d66fd14 100644
--- a/car-x86_64/android.hardware.dummy.xml
+++ b/common/android.hardware.dummy.xml
diff --git a/car-x86_64/bootanimations/bootanimation-832.zip b/common/bootanimations/bootanimation-832.zip
index 76b9c82..76b9c82 100644
--- a/car-x86_64/bootanimations/bootanimation-832.zip
+++ b/common/bootanimations/bootanimation-832.zip
Binary files differ
diff --git a/car-x86_64/init.car-x86_64.rc b/common/init.car-emulator.rc
index 34db798..34db798 100644
--- a/car-x86_64/init.car-x86_64.rc
+++ b/common/init.car-emulator.rc
diff --git a/car-x86_64/preloaded-classes-car b/common/preloaded-classes-car
index 962099f..962099f 100644
--- a/car-x86_64/preloaded-classes-car
+++ b/common/preloaded-classes-car