aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-19 21:23:17 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-19 21:23:17 +0000
commit50ee3c3b1a559124aa0a9a658629cf1bdd009e83 (patch)
tree146a9dabd4c91cdea10ba74374d48b39431c8c0a
parentd9ab3f11194df0b6f9b6d9f861e2f63f271f98fb (diff)
parentd4af0a86c756dec31f4aaf0d83ce318bef11ed0d (diff)
downloadrobolectric-shadows-50ee3c3b1a559124aa0a9a658629cf1bdd009e83.tar.gz
Snap for 11237524 from d4af0a86c756dec31f4aaf0d83ce318bef11ed0d to mainline-odp-releaseaml_odp_341717000aml_odp_341610000
Change-Id: Ic338604d1a48670a89d86d163a1467dbbd6776bb
-rw-r--r--Android.bp2
-rw-r--r--shadows/androidx/fragment/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index c12f01202..f314f50cd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -160,7 +160,7 @@ java_host_for_device {
":__subpackages__",
//java references
"//frameworks/opt/net/wifi/libs/WifiTrackerLib/tests:__pkg__",
- "//prebuilts/sdk/current/androidx:__pkg__",
+ "//prebuilts/sdk/current/androidx:__subpackages__",
"//prebuilts/sdk/current/aaos-libs:__pkg__",
"//packages/apps/TV/tests/common:__pkg__",
//robolectric tests
diff --git a/shadows/androidx/fragment/Android.mk b/shadows/androidx/fragment/Android.mk
index 6b538e33b..e9f1bc9c7 100644
--- a/shadows/androidx/fragment/Android.mk
+++ b/shadows/androidx/fragment/Android.mk
@@ -14,7 +14,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/src/test/resources/res
# This exists to coerce make into generating and compiling R.java.
LOCAL_STATIC_JAVA_LIBRARIES := androidx.fragment_fragment
-LOCAL_MIN_SDK_VERSION := 16
+LOCAL_MIN_SDK_VERSION := 19
LOCAL_SDK_VERSION := current