diff options
| -rw-r--r-- | BoardConfig-common.mk | 9 | ||||
| -rw-r--r-- | aosp_common.mk | 4 | ||||
| -rw-r--r-- | device.mk | 12 | ||||
| -rw-r--r-- | manifest-gralloc3.xml | 13 | ||||
| -rw-r--r-- | manifest.xml | 13 | ||||
| -rw-r--r-- | manifest_64-gralloc3.xml | 218 | ||||
| -rw-r--r-- | manifest_64.xml | 183 |
7 files changed, 2 insertions, 450 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index d9cae70..e2bfb89 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -32,15 +32,6 @@ TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := generic TARGET_CPU_VARIANT_RUNTIME := cortex-a53 -ifeq (,$(filter %_64,$(TARGET_PRODUCT))) -TARGET_2ND_ARCH := arm -TARGET_2ND_ARCH_VARIANT := armv8-a -TARGET_2ND_CPU_ABI := armeabi-v7a -TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := generic -TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53 -endif - BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y diff --git a/aosp_common.mk b/aosp_common.mk index e2d5d43..52ea597 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -17,11 +17,7 @@ # # All components inherited here go to system image # -ifeq (,$(filter %_64,$(TARGET_PRODUCT))) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) -endif $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) # Enable CSI checking @@ -18,10 +18,6 @@ include device/google/gs-common/device.mk TARGET_BOARD_PLATFORM := gs201 -ifneq (,$(filter %_64,$(TARGET_PRODUCT))) -LOCAL_64ONLY := _64 -endif - AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ POSTINSTALL_PATH_system=system/bin/otapreopt_script \ @@ -202,10 +198,10 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device Manifest, Device Compatibility Matrix for Treble ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4) DEVICE_MANIFEST_FILE := \ - device/google/gs201/manifest$(LOCAL_64ONLY).xml + device/google/gs201/manifest.xml else DEVICE_MANIFEST_FILE := \ - device/google/gs201/manifest$(LOCAL_64ONLY)-gralloc3.xml + device/google/gs201/manifest-gralloc3.xml endif ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) @@ -852,11 +848,7 @@ endif include device/google/gs201/gnss/device-gnss.mk BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/gps -ifeq (,$(filter %_64,$(TARGET_PRODUCT))) -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) -endif #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) #$(call inherit-product-if-exists, hardware/google_devices/gs201/gs201.mk) #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index 89e9e3a..33b3d67 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -26,19 +26,6 @@ <instance>default</instance> </interface> </hal> - <hal format="hidl"> - <name>android.hardware.media.omx</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IOmx</name> - <instance>default</instance> - </interface> - <interface> - <name>IOmxStore</name> - <instance>default</instance> - </interface> - </hal> <hal format="hidl"> <name>android.hardware.graphics.allocator</name> <transport>hwbinder</transport> diff --git a/manifest.xml b/manifest.xml index b446f5b..83a412c 100644 --- a/manifest.xml +++ b/manifest.xml @@ -27,19 +27,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.media.omx</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IOmx</name> - <instance>default</instance> - </interface> - <interface> - <name>IOmxStore</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.graphics.allocator</name> <transport>hwbinder</transport> <version>4.0</version> diff --git a/manifest_64-gralloc3.xml b/manifest_64-gralloc3.xml deleted file mode 100644 index 3e70ec4..0000000 --- a/manifest_64-gralloc3.xml +++ /dev/null @@ -1,218 +0,0 @@ -<manifest version="1.0" type="device" target-level="5"> - <hal format="hidl"> - <name>android.hardware.audio</name> - <transport>hwbinder</transport> - <version>7.0</version> - <interface> - <name>IDevicesFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.audio.effect</name> - <transport>hwbinder</transport> - <version>7.0</version> - <interface> - <name>IEffectsFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.soundtrigger</name> - <transport>hwbinder</transport> - <version>2.3</version> - <interface> - <name>ISoundTriggerHw</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.allocator</name> - <transport>hwbinder</transport> - <version>2.0</version> - <interface> - <name>IAllocator</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.mapper</name> - <transport arch="32+64">passthrough</transport> - <version>2.1</version> - <interface> - <name>IMapper</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.composer</name> - <transport>hwbinder</transport> - <version>2.4</version> - <interface> - <name>IComposer</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.memtrack</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IMemtrack</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.renderscript</name> - <transport arch="32+64">passthrough</transport> - <version>1.0</version> - <interface> - <name>IDevice</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.drm</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>ICryptoFactory</name> - <instance>default</instance> - </interface> - <interface> - <name>IDrmFactory</name> - <instance>default</instance> - </interface> - <fqname>@1.3::ICryptoFactory/clearkey</fqname> - <fqname>@1.3::IDrmFactory/clearkey</fqname> - <fqname>@1.3::ICryptoFactory/widevine</fqname> - <fqname>@1.3::IDrmFactory/widevine</fqname> - </hal> - <hal format = "hidl"> - <name>android.hardware.dumpstate</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IDumpstateDevice</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.bluetooth</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IBluetoothHci</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.bluetooth.audio</name> - <transport>hwbinder</transport> - <version>2.1</version> - <interface> - <name>IBluetoothAudioProvidersFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.boot</name> - <transport>hwbinder</transport> - <fqname>@1.2::IBootControl/default</fqname> - </hal> - <hal format="hidl"> - <name>android.hardware.sensors</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>ISensors</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.neuralnetworks</name> - <transport>hwbinder</transport> - <version>1.3</version> - <interface> - <name>IDevice</name> - <instance>google-armnn</instance> - </interface> - <fqname>@1.3::IDevice/google-armnn</fqname> - </hal> - <hal format="hidl"> - <name>android.hardware.neuralnetworks</name> - <transport>hwbinder</transport> - <fqname>@1.3::IDevice/google-edgetpu</fqname> - </hal> - <hal format="hidl"> - <name>android.hardware.health</name> - <transport>hwbinder</transport> - <version>2.1</version> - <interface> - <name>IHealth</name> - <instance>default</instance> - </interface> - </hal> - <hal format="aidl"> - <name>com.google.input</name> - <interface> - <name>ITouchContextService</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>hardware.google.bluetooth.bt_channel_avoidance</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IBTChannelAvoidance</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>hardware.google.bluetooth.sar</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IBluetoothSar</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>hardware.google.bluetooth.ccc</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IBluetoothCcc</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>vendor.google.google_battery</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IGoogleBattery</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>vendor.google.whitechapel.audio.audioext</name> - <transport>hwbinder</transport> - <version>2.0</version> - <interface> - <name>IAudioExt</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>vendor.google.audiometricext</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IAudioMetricExt</name> - <instance>default</instance> - </interface> - </hal> - <kernel target-level="6"/> -</manifest> diff --git a/manifest_64.xml b/manifest_64.xml deleted file mode 100644 index 17b08d0..0000000 --- a/manifest_64.xml +++ /dev/null @@ -1,183 +0,0 @@ -<manifest version="1.0" type="device" target-level="5"> - <hal format="hidl"> - <name>android.hardware.audio</name> - <transport>hwbinder</transport> - <version>7.0</version> - <interface> - <name>IDevicesFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.audio.effect</name> - <transport>hwbinder</transport> - <version>7.0</version> - <interface> - <name>IEffectsFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.soundtrigger</name> - <transport>hwbinder</transport> - <version>2.3</version> - <interface> - <name>ISoundTriggerHw</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.allocator</name> - <transport>hwbinder</transport> - <version>4.0</version> - <interface> - <name>IAllocator</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.mapper</name> - <transport arch="32+64">passthrough</transport> - <version>4.0</version> - <interface> - <name>IMapper</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.composer</name> - <transport>hwbinder</transport> - <version>2.4</version> - <interface> - <name>IComposer</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.renderscript</name> - <transport arch="32+64">passthrough</transport> - <version>1.0</version> - <interface> - <name>IDevice</name> - <instance>default</instance> - </interface> - </hal> - <hal format = "hidl"> - <name>android.hardware.dumpstate</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IDumpstateDevice</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.bluetooth</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IBluetoothHci</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.bluetooth.audio</name> - <transport>hwbinder</transport> - <version>2.1</version> - <interface> - <name>IBluetoothAudioProvidersFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.boot</name> - <transport>hwbinder</transport> - <fqname>@1.2::IBootControl/default</fqname> - </hal> - <hal format="hidl"> - <name>android.hardware.neuralnetworks</name> - <transport>hwbinder</transport> - <version>1.3</version> - <interface> - <name>IDevice</name> - <instance>google-armnn</instance> - </interface> - <fqname>@1.3::IDevice/google-armnn</fqname> - </hal> - <hal format="hidl"> - <name>android.hardware.neuralnetworks</name> - <transport>hwbinder</transport> - <fqname>@1.3::IDevice/google-edgetpu</fqname> - </hal> - <hal format="hidl"> - <name>android.hardware.health</name> - <transport>hwbinder</transport> - <version>2.1</version> - <interface> - <name>IHealth</name> - <instance>default</instance> - </interface> - </hal> - <hal format="aidl"> - <name>com.google.input</name> - <interface> - <name>ITouchContextService</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>hardware.google.bluetooth.bt_channel_avoidance</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IBTChannelAvoidance</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>hardware.google.bluetooth.sar</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IBluetoothSar</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>hardware.google.bluetooth.ccc</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IBluetoothCcc</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>vendor.google.google_battery</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IGoogleBattery</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>vendor.google.whitechapel.audio.audioext</name> - <transport>hwbinder</transport> - <version>2.0</version> - <interface> - <name>IAudioExt</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>vendor.google.audiometricext</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IAudioMetricExt</name> - <instance>default</instance> - </interface> - </hal> - <kernel target-level="6"/> -</manifest> |