diff options
-rw-r--r-- | AndroidProducts.mk | 6 | ||||
-rw-r--r-- | gsi_car_arm64.mk | 22 | ||||
-rw-r--r-- | gsi_car_base.mk | 140 | ||||
-rw-r--r-- | gsi_car_x86_64.mk | 22 |
4 files changed, 0 insertions, 190 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 13eeea7..ff095c2 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -20,9 +20,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_car_x86.mk \ $(LOCAL_DIR)/aosp_car_x86_64.mk \ $(LOCAL_DIR)/car_x86_64.mk \ - $(LOCAL_DIR)/gsi_car_arm64.mk \ - $(LOCAL_DIR)/gsi_car_x86_64.mk \ - COMMON_LUNCH_CHOICES := \ aosp_car_arm-userdebug \ @@ -30,8 +27,5 @@ COMMON_LUNCH_CHOICES := \ aosp_car_x86-userdebug \ aosp_car_x86_64-userdebug \ car_x86_64-userdebug \ - gsi_car_arm64-userdebug \ - gsi_car_x86_64-userdebug \ - EMULATOR_VENDOR_NO_SOUND_TRIGGER := false diff --git a/gsi_car_arm64.mk b/gsi_car_arm64.mk deleted file mode 100644 index 0977da4..0000000 --- a/gsi_car_arm64.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2021 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/gsi_car_base.mk) -$(call inherit-product, device/generic/common/gsi_arm64.mk) - -PRODUCT_NAME := gsi_car_arm64 -PRODUCT_DEVICE := generic_arm64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := Car GSI on arm64
\ No newline at end of file diff --git a/gsi_car_base.mk b/gsi_car_base.mk deleted file mode 100644 index 23071d2..0000000 --- a/gsi_car_base.mk +++ /dev/null @@ -1,140 +0,0 @@ -# -# Copyright (C) 2021 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_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed - -PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ - root/init.bootstat.rc \ - root/init.car.rc \ - system/app/CarFrameworkPackageStubs/CarFrameworkPackageStubs.apk \ - system/app/CarFrameworkPackageStubs/oat/arm64/CarFrameworkPackageStubs.odex \ - system/app/CarFrameworkPackageStubs/oat/arm64/CarFrameworkPackageStubs.vdex \ - system/app/CarLatinIME/CarLatinIME.apk \ - system/app/CarMapsPlaceholder/CarMapsPlaceholder.apk \ - system/app/CarPermissionControllerRRO/CarPermissionControllerRRO.apk \ - system/app/RotaryIME/RotaryIME.apk \ - system/app/RotaryIME/oat/arm64/RotaryIME.odex \ - system/app/RotaryIME/oat/arm64/RotaryIME.vdex \ - system/app/RotaryPlayground/RotaryPlayground.apk \ - system/app/SampleCustomInputService/SampleCustomInputService.apk \ - system/app/SampleRearViewCamera/SampleRearViewCamera.apk \ - system/app/SampleRearViewCamera/oat/arm64/SampleRearViewCamera.odex \ - system/app/SampleRearViewCamera/oat/arm64/SampleRearViewCamera.vdex \ - system/app/SystemUpdater/SystemUpdater.apk \ - system/bin/android.automotive.evs.manager@1.1 \ - system/bin/carbugreportd \ - system/bin/carpowerpolicyd \ - system/bin/carwatchdogd \ - system/bin/com.android.car.procfsinspector \ - system/etc/apns-conf.xml \ - system/etc/init/android.automotive.evs.manager@1.1.rc \ - system/etc/init/carbugreportd.rc \ - system/etc/init/carpowerpolicyd.rc \ - system/etc/init/carwatchdogd.rc \ - system/etc/init/com.android.car.procfsinspector.rc \ - system/etc/init/init.bootstat.car.rc \ - system/etc/init/init.car.rc \ - system/etc/old-apns-conf.xml \ - system/etc/permissions/android.car.cluster.xml \ - system/etc/permissions/android.car.usb.handler.xml \ - system/etc/permissions/android.hardware.broadcastradio.xml \ - system/etc/permissions/android.hardware.type.automotive.xml \ - system/etc/permissions/com.android.car.activityresolver.xml \ - system/etc/permissions/com.android.car.bugreport.xml \ - system/etc/permissions/com.android.car.carlauncher.xml \ - system/etc/permissions/com.android.car.cluster.home.xml \ - system/etc/permissions/com.android.car.dialer.xml \ - system/etc/permissions/com.android.car.hvac.xml \ - system/etc/permissions/com.android.car.media.xml \ - system/etc/permissions/com.android.car.messenger.xml \ - system/etc/permissions/com.android.car.radio.xml \ - system/etc/permissions/com.android.car.rotary.xml \ - system/etc/permissions/com.android.car.settings.xml \ - system/etc/permissions/com.android.car.shell.xml \ - system/etc/permissions/com.android.car.xml \ - system/etc/permissions/com.google.android.car.defaultstoragemonitoringcompanionapp.xml \ - system/etc/permissions/com.google.android.car.garagemode.testapp.xml \ - system/etc/permissions/com.google.android.car.kitchensink.xml \ - system/etc/permissions/com.google.android.car.networking.preferenceupdater.xml \ - system/etc/sysconfig/preinstalled-packages-product-car-base.xml \ - system/etc/vintf/manifest/carpowerpolicyd.xml \ - system/etc/vintf/manifest/carwatchdogd.xml \ - system/etc/vintf/manifest/manifest_android.automotive.evs.manager@1.1.xml \ - system/framework/android.car.jar \ - system/framework/car-frameworks-service.jar \ - system/framework/oat/arm64/car-frameworks-service.odex \ - system/framework/oat/arm64/car-frameworks-service.vdex \ - system/lib/libcar-framework-service-jni.so \ - system/lib/libsuspend.so \ - system/lib64/android.automotive.watchdog-V3-cpp.so \ - system/lib64/android.automotive.watchdog.internal-cpp.so \ - system/lib64/android.frameworks.automotive.display@1.0.so \ - system/lib64/android.frameworks.automotive.powerpolicy-V1-cpp.so \ - system/lib64/android.frameworks.automotive.powerpolicy.internal-cpp.so \ - system/lib64/android.hardware.automotive.evs@1.0.so \ - system/lib64/android.hardware.automotive.evs@1.1.so \ - system/lib64/android.hardware.automotive.vehicle@2.0.so \ - system/lib64/libcar-framework-service-jni.so \ - system/lib64/libsuspend.so \ - system/lib64/libwatchdog_binder_mediator.so \ - system/lib64/libwatchdog_package_info_resolver.so \ - system/lib64/libwatchdog_perf_service.so \ - system/lib64/libwatchdog_process_service.so \ - system/media/bootanimation.zip \ - system/priv-app/BugReportApp/BugReportApp.apk \ - system/priv-app/CarActivityResolver/CarActivityResolver.apk \ - system/priv-app/CarActivityResolver/oat/arm64/CarActivityResolver.odex \ - system/priv-app/CarActivityResolver/oat/arm64/CarActivityResolver.vdex \ - system/priv-app/CarDialerApp/CarDialerApp.apk \ - system/priv-app/CarHvacApp/CarHvacApp.apk \ - system/priv-app/CarLauncher/CarLauncher.apk \ - system/priv-app/CarMediaApp/CarMediaApp.apk \ - system/priv-app/CarMessengerApp/CarMessengerApp.apk \ - system/priv-app/CarRadioApp/CarRadioApp.apk \ - system/priv-app/CarRotaryController/CarRotaryController.apk \ - system/priv-app/CarService/CarService.apk \ - system/priv-app/CarService/oat/arm64/CarService.odex \ - system/priv-app/CarService/oat/arm64/CarService.vdex \ - system/priv-app/CarSettings/CarSettings.apk \ - system/priv-app/CarShell/CarShell.apk \ - system/priv-app/CarShell/oat/arm64/CarShell.odex \ - system/priv-app/CarShell/oat/arm64/CarShell.vdex \ - system/priv-app/CarUsbHandler/CarUsbHandler.apk \ - system/priv-app/CarUsbHandler/oat/arm64/CarUsbHandler.odex \ - system/priv-app/CarUsbHandler/oat/arm64/CarUsbHandler.vdex \ - system/priv-app/ClusterHomeSample/ClusterHomeSample.apk \ - system/priv-app/ClusterHomeSample/oat/arm64/ClusterHomeSample.odex \ - system/priv-app/ClusterHomeSample/oat/arm64/ClusterHomeSample.vdex \ - system/priv-app/DefaultStorageMonitoringCompanionApp/DefaultStorageMonitoringCompanionApp.apk \ - system/priv-app/DirectRenderingCluster/DirectRenderingCluster.apk \ - system/priv-app/DirectRenderingCluster/oat/arm64/DirectRenderingCluster.odex \ - system/priv-app/DirectRenderingCluster/oat/arm64/DirectRenderingCluster.vdex \ - system/priv-app/EmbeddedKitchenSinkApp/EmbeddedKitchenSinkApp.apk \ - system/priv-app/ExperimentalCarService/ExperimentalCarService.apk \ - system/priv-app/ExperimentalCarService/oat/arm64/ExperimentalCarService.odex \ - system/priv-app/ExperimentalCarService/oat/arm64/ExperimentalCarService.vdex \ - system/priv-app/GarageModeTestApp/GarageModeTestApp.apk \ - system/priv-app/LocalMediaPlayer/LocalMediaPlayer.apk \ - system/priv-app/NetworkPreferenceApp/NetworkPreferenceApp.apk \ - system/lib64/libcarservicejni.so \ - system/priv-app/CarService/lib/arm64/libcarservicejni.so \ - -PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += %.odex %.vdex %.art - -PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -EMULATOR_VENDOR_NO_SENSORS := true -PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true -$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) -EMULATOR_VENDOR_NO_SOUND := true diff --git a/gsi_car_x86_64.mk b/gsi_car_x86_64.mk deleted file mode 100644 index 378fa5c..0000000 --- a/gsi_car_x86_64.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 2021 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/gsi_car_base.mk) -$(call inherit-product, device/generic/common/gsi_x86_64.mk) - -PRODUCT_NAME := gsi_car_x86_64 -PRODUCT_DEVICE := generic_x86_64 -PRODUCT_BRAND := Android -PRODUCT_MODEL := Car GSI on x86_64
\ No newline at end of file |