From 5d81a5814bc18e933b33ac42bedc2bf88d763f81 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 9 Sep 2019 10:55:24 -0700 Subject: [PATCH] Remove unused libcrypto dependency. libcrypto is unused, which causes problems when boringssl hash injection is turned on as the code is all stripped and there is nothing left to inject the hash into. Bug: 137267623 Test: Ran the following together with the changes from http://r.android.com/q/topic:bug137267623_bsslselftest m VtsHalDrmV1_{0,1,2}TargetTest \ VtsHalWifiHostapdV1_{0,1}TargetTest{,Util} \ VtsHalWifiSupplicantV1_{0,1,2}TargetTest{,Util} \ VtsHalWifiSupplicantP2pV1_{0,2}TargetTest (croot hardware/interfaces/confirmationui ; mma) (croot hardware/interfaces/drm ; mma) (croot hardware/interfaces/keymaster ; mma) Change-Id: Ib0607671ef71d99becb483774f810aad9762f4f1 --- drm/1.1/vts/functional/Android.bp | 1 - wifi/hostapd/1.0/vts/functional/Android.bp | 2 -- wifi/hostapd/1.1/vts/functional/Android.bp | 2 -- wifi/supplicant/1.0/vts/functional/Android.bp | 3 --- wifi/supplicant/1.1/vts/functional/Android.bp | 2 -- wifi/supplicant/1.2/vts/functional/Android.bp | 3 --- 6 files changed, 13 deletions(-) diff --git a/drm/1.1/vts/functional/Android.bp b/drm/1.1/vts/functional/Android.bp index 1090b6900d..47b02bf179 100644 --- a/drm/1.1/vts/functional/Android.bp +++ b/drm/1.1/vts/functional/Android.bp @@ -29,7 +29,6 @@ cc_test { "libhidlmemory", "libnativehelper", "libssl", - "libcrypto", ], test_suites: ["general-tests"], } diff --git a/wifi/hostapd/1.0/vts/functional/Android.bp b/wifi/hostapd/1.0/vts/functional/Android.bp index 93867d28ad..5645019d0e 100644 --- a/wifi/hostapd/1.0/vts/functional/Android.bp +++ b/wifi/hostapd/1.0/vts/functional/Android.bp @@ -26,7 +26,6 @@ cc_library_static { "android.hardware.wifi.hostapd@1.0", "android.hardware.wifi.hostapd@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", @@ -46,7 +45,6 @@ cc_test { "android.hardware.wifi.hostapd@1.0", "android.hardware.wifi.hostapd@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", diff --git a/wifi/hostapd/1.1/vts/functional/Android.bp b/wifi/hostapd/1.1/vts/functional/Android.bp index bbf5246cee..02ec2e637d 100644 --- a/wifi/hostapd/1.1/vts/functional/Android.bp +++ b/wifi/hostapd/1.1/vts/functional/Android.bp @@ -27,7 +27,6 @@ cc_library_static { "android.hardware.wifi.hostapd@1.0", "android.hardware.wifi.hostapd@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", @@ -48,7 +47,6 @@ cc_test { "android.hardware.wifi.hostapd@1.0", "android.hardware.wifi.hostapd@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", diff --git a/wifi/supplicant/1.0/vts/functional/Android.bp b/wifi/supplicant/1.0/vts/functional/Android.bp index bdccac1919..ba7973813d 100644 --- a/wifi/supplicant/1.0/vts/functional/Android.bp +++ b/wifi/supplicant/1.0/vts/functional/Android.bp @@ -26,7 +26,6 @@ cc_library_static { "android.hardware.wifi.supplicant@1.0", "android.hardware.wifi.supplicant@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", @@ -48,7 +47,6 @@ cc_test { "android.hardware.wifi.supplicant@1.0", "android.hardware.wifi.supplicant@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", @@ -69,7 +67,6 @@ cc_test { "android.hardware.wifi.supplicant@1.0", "android.hardware.wifi.supplicant@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", diff --git a/wifi/supplicant/1.1/vts/functional/Android.bp b/wifi/supplicant/1.1/vts/functional/Android.bp index 353ae4b844..84575321b8 100644 --- a/wifi/supplicant/1.1/vts/functional/Android.bp +++ b/wifi/supplicant/1.1/vts/functional/Android.bp @@ -27,7 +27,6 @@ cc_library_static { "android.hardware.wifi.supplicant@1.0", "android.hardware.wifi.supplicant@1.1", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", @@ -51,7 +50,6 @@ cc_test { "android.hardware.wifi.supplicant@1.1", "android.hardware.wifi@1.0", "android.hardware.wifi@1.1", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", diff --git a/wifi/supplicant/1.2/vts/functional/Android.bp b/wifi/supplicant/1.2/vts/functional/Android.bp index 1b970e1ce6..b7949d103d 100644 --- a/wifi/supplicant/1.2/vts/functional/Android.bp +++ b/wifi/supplicant/1.2/vts/functional/Android.bp @@ -29,7 +29,6 @@ cc_library_static { "android.hardware.wifi.supplicant@1.1", "android.hardware.wifi.supplicant@1.2", "android.hardware.wifi@1.0", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", @@ -54,7 +53,6 @@ cc_test { "android.hardware.wifi.supplicant@1.2", "android.hardware.wifi@1.0", "android.hardware.wifi@1.1", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface", @@ -79,7 +77,6 @@ cc_test { "android.hardware.wifi.supplicant@1.2", "android.hardware.wifi@1.0", "android.hardware.wifi@1.1", - "libcrypto", "libgmock", "libwifi-system", "libwifi-system-iface",