diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-04 00:57:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-04 00:57:31 +0000 |
| commit | b1474f8041c933d7a35b153c0ab1264f00a2538b (patch) | |
| tree | 461a75413b51bb45154d224b6a5f04784e943b16 | |
| parent | 4f74cc603d96e27730dd95c77d0d3aaa821291dd (diff) | |
| parent | 7ca3b7ab9f215ada0f11e8d0d6a1c68bfc5f8354 (diff) | |
| download | wpa_supplicant_8-android14-qpr2-s1-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25781641'] into 24Q1-release.android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I0a9d7cfb16a54ee0090162d421107f7ab5554c1c
| -rw-r--r-- | hostapd/Android.mk | 2 | ||||
| -rw-r--r-- | wpa_supplicant/Android.mk | 2 |
2 files changed, 4 insertions, 0 deletions
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) |