From aa948d83570e29566212409dbd1d68cd9727f825 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 27 Feb 2018 17:00:06 -0800 Subject: [PATCH] Only include bitness of hal impls that is used. Bug: 73829928 Test: boot walleye, check directories, no errors during boot Change-Id: Ia1272b2bcc5006fa75a50631861fbaccdeed7bee --- CleanSpec.mk | 4 ++++ device.mk | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index b0c4379e..427efc57 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -168,3 +168,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.powe # Remove Vibrator HAL 1.1 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.vibrator@1.1-service.wahoo.rc) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.vibrator@1.1-service.wahoo) + +# Remove all HALs (actual bitness now being specified) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/*) diff --git a/device.mk b/device.mk index 88f2318e..739065af 100755 --- a/device.mk +++ b/device.mk @@ -297,10 +297,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ hwcomposer.msm8998 \ - android.hardware.graphics.composer@2.1-impl \ + android.hardware.graphics.composer@2.1-impl:64 \ android.hardware.graphics.composer@2.1-service \ gralloc.msm8998 \ - android.hardware.graphics.allocator@2.0-impl \ + android.hardware.graphics.allocator@2.0-impl:64 \ android.hardware.graphics.allocator@2.0-service \ android.hardware.graphics.mapper@2.0-impl \ libbt-vendor @@ -312,7 +312,7 @@ PRODUCT_PACKAGES += \ # Light HAL PRODUCT_PACKAGES += \ lights.$(PRODUCT_HARDWARE) \ - android.hardware.light@2.0-impl \ + android.hardware.light@2.0-impl:64 \ android.hardware.light@2.0-service # eSE applet HALs @@ -328,13 +328,13 @@ PRODUCT_PACKAGES += \ # Bluetooth HAL PRODUCT_PACKAGES += \ libbt-vendor \ - android.hardware.bluetooth@1.0-impl \ + android.hardware.bluetooth@1.0-impl:64 \ android.hardware.bluetooth@1.0-service \ wcnss_filter # DRM HAL PRODUCT_PACKAGES += \ - android.hardware.drm@1.0-impl \ + android.hardware.drm@1.0-impl:32 \ android.hardware.drm@1.0-service \ android.hardware.drm@1.0-service.widevine \ android.hardware.drm@1.1-service.clearkey \ @@ -349,7 +349,7 @@ PRODUCT_PACKAGES += \ nfc_nci.msm8998 \ NfcNci \ Tag \ - android.hardware.nfc@1.0-impl \ + android.hardware.nfc@1.0-impl:64 \ android.hardware.nfc@1.0-service PRODUCT_COPY_FILES += \ @@ -368,7 +368,7 @@ PRODUCT_PACKAGES += \ libc2dcolorconvert PRODUCT_PACKAGES += \ - android.hardware.camera.provider@2.4-impl \ + android.hardware.camera.provider@2.4-impl:32 \ android.hardware.camera.provider@2.4-service \ camera.device@3.2-impl \ camera.msm8998 \ @@ -378,7 +378,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ sensors.$(PRODUCT_HARDWARE) \ - android.hardware.sensors@1.0-impl \ + android.hardware.sensors@1.0-impl:64 \ android.hardware.sensors@1.0-service PRODUCT_COPY_FILES += \ @@ -394,12 +394,12 @@ PRODUCT_PACKAGES += \ # Context hub HAL PRODUCT_PACKAGES += \ - android.hardware.contexthub@1.0-impl.generic \ + android.hardware.contexthub@1.0-impl.generic:64 \ android.hardware.contexthub@1.0-service # Boot control HAL PRODUCT_PACKAGES += \ - android.hardware.boot@1.0-impl \ + android.hardware.boot@1.0-impl:64 \ android.hardware.boot@1.0-service \ # Vibrator HAL @@ -463,9 +463,9 @@ PRODUCT_PACKAGES += \ libaudio-resampler PRODUCT_PACKAGES += \ - android.hardware.audio@2.0-impl \ - android.hardware.audio.effect@2.0-impl \ - android.hardware.soundtrigger@2.1-impl \ + android.hardware.audio@2.0-impl:32 \ + android.hardware.audio.effect@2.0-impl:32 \ + android.hardware.soundtrigger@2.1-impl:32 \ android.hardware.audio@2.0-service # stereo speakers: orientation changes swap L/R channels