From 7ca3b7ab9f215ada0f11e8d0d6a1c68bfc5f8354 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Wed, 3 Jan 2024 10:59:48 +0900 Subject: set LOCAL_MIN_SDK_VERSION as 34 for hostapd and wpa_supplicant Bug: 317676192 Test: these should have weak symbols of APersistableBundle_* (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fd58a51937b832a4843eb44fff805235bf04b4be) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fcf7ac8c17bb671aef0363fbe34aea112c00e95b) Merged-In: Ia0a86750d61422e9c8a8d6cc62715572689b308d Change-Id: Ia0a86750d61422e9c8a8d6cc62715572689b308d --- hostapd/Android.mk | 2 ++ wpa_supplicant/Android.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 35ada837..a40005b7 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -1199,6 +1199,7 @@ LOCAL_SHARED_LIBRARIES += android.hardware.wifi.common-V1-ndk LOCAL_SHARED_LIBRARIES += libbase libutils LOCAL_SHARED_LIBRARIES += libbinder_ndk LOCAL_STATIC_LIBRARIES += libhostapd_aidl +LOCAL_MIN_SDK_VERSION := 34 endif LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(OBJS) @@ -1255,6 +1256,7 @@ LOCAL_SHARED_LIBRARIES := \ libbase \ libutils \ liblog +LOCAL_MIN_SDK_VERSION := 34 LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/aidl include $(BUILD_STATIC_LIBRARY) diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 509dbbc0..474873a8 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1968,6 +1968,7 @@ LOCAL_SHARED_LIBRARIES += libutils libbase LOCAL_SHARED_LIBRARIES += libbinder_ndk LOCAL_STATIC_LIBRARIES += libwpa_aidl LOCAL_VINTF_FRAGMENTS := aidl/android.hardware.wifi.supplicant.xml +LOCAL_MIN_SDK_VERSION := 34 ifeq ($(WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY), true) LOCAL_INIT_RC=aidl/android.hardware.wifi.supplicant-service.rc endif @@ -2073,6 +2074,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ liblog \ libssl +LOCAL_MIN_SDK_VERSION := 34 LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH)/aidl include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3