commit aa948d83570e29566212409dbd1d68cd9727f825
author Steven Moreland <smoreland@google.com> Tue Feb 27 17:00:06 2018 -0800
committer Thierry Strudel <tstrudel@google.com> Fri Mar 02 17:27:31 2018 +0000
tree 7814ca612370a7715587985d5fb66409eaffcb44
parent d62bbdfe6ca313e2cccdb308ddbd0058bc4a405f

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

diff --git a/CleanSpec.mk b/CleanSpec.mk
index b0c4379..427efc5 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -168,3 +168,7 @@
 # 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/*)

device.mk

diff --git a/device.mk b/device.mk
index 88f2318..739065a 100755
--- a/device.mk
+++ b/device.mk
@@ -297,10 +297,10 @@
 
 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 @@
 # 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 @@
 # 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 @@
     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 @@
     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 += \
     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 @@
 
 # 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 @@
     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