From 192a5750d7fbf542d332689791a6db7d1cf7c7a0 Mon Sep 17 00:00:00 2001 From: Charlie Boutier Date: Thu, 21 Apr 2022 09:07:06 +0000 Subject: Pandora: Modify visibility from Blueberry to Pandora Blueberry2.0 project is under rebranding. The Blueberry folder is rebranded to Pandora so the visibility has to be updated accordingly. Change-Id: Ib46209b527e01ab0a9f47305edeedbada1686672 --- Android.bp | 2 +- netty/shaded/Android.bp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index 3c03e6ce6..5a37d3779 100644 --- a/Android.bp +++ b/Android.bp @@ -63,7 +63,7 @@ java_library { "grpc-java-protobuf-lite", "grpc-java-stub", ], - visibility: ["//packages/modules/Bluetooth/android/blueberry/server"], + visibility: ["//packages/modules/Bluetooth/android/pandora/server"], } java_library { diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp index e4563a1ca..3fe93f0fd 100644 --- a/netty/shaded/Android.bp +++ b/netty/shaded/Android.bp @@ -40,5 +40,5 @@ java_library { static_libs: [ "grpc-netty-shaded-1.16.1-jar", ], - visibility: ["//packages/modules/Bluetooth/android/blueberry/server"], + visibility: ["//packages/modules/Bluetooth/android/pandora/server"], } -- cgit v1.2.3 From a7cdc6133b5e2ec4f6b6b52258851fedd5c935af Mon Sep 17 00:00:00 2001 From: Charlie Boutier Date: Thu, 21 Apr 2022 09:07:06 +0000 Subject: Pandora: Modify visibility from Blueberry to Pandora Blueberry2.0 project is under rebranding. The Blueberry folder is rebranded to Pandora so the visibility has to be updated accordingly. Ignore-AOSP-First: Cherry-picked from AOSP Bug: 241962982 Merged-In: Ib46209b527e01ab0a9f47305edeedbada1686672 Change-Id: Ib46209b527e01ab0a9f47305edeedbada1686672 --- Android.bp | 2 +- netty/shaded/Android.bp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index 3c03e6ce6..5a37d3779 100644 --- a/Android.bp +++ b/Android.bp @@ -63,7 +63,7 @@ java_library { "grpc-java-protobuf-lite", "grpc-java-stub", ], - visibility: ["//packages/modules/Bluetooth/android/blueberry/server"], + visibility: ["//packages/modules/Bluetooth/android/pandora/server"], } java_library { diff --git a/netty/shaded/Android.bp b/netty/shaded/Android.bp index e4563a1ca..3fe93f0fd 100644 --- a/netty/shaded/Android.bp +++ b/netty/shaded/Android.bp @@ -40,5 +40,5 @@ java_library { static_libs: [ "grpc-netty-shaded-1.16.1-jar", ], - visibility: ["//packages/modules/Bluetooth/android/blueberry/server"], + visibility: ["//packages/modules/Bluetooth/android/pandora/server"], } -- cgit v1.2.3 From c30e2fb344815b97cff4344efd6ecd06d8c2b54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Fri, 26 Aug 2022 18:35:55 +0000 Subject: Switch to source-built GSON. Bug: 243950468 Test: local build, presubmit, check that aosp_raven boots. Change-Id: I256b10efe37b2b4b8ff3a79d05b3635f50472724 --- core/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Android.bp b/core/Android.bp index d563293c8..2267ecb1f 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -66,7 +66,7 @@ java_library { "grpc-java-core", "grpc-java-context", "jsr305", - "gson-prebuilt-jar", + "gson", "error_prone_annotations", "guava", "opencensus-java-api", -- cgit v1.2.3 From ba37596daa430d4cec87cbe3bb59cf27edebf8dc Mon Sep 17 00:00:00 2001 From: Neil Vohra Date: Thu, 8 Sep 2022 20:05:01 +0000 Subject: Set min_sdk_version and apex_available fields in gRPC libraries for use in AdServices module Test: Presubmits Bug: b/237838314 Change-Id: Ia0334515e78988bb13a61d7b68d6549003019fd0 --- Android.bp | 20 ++++++++++++++++++++ context/Android.bp | 2 ++ core/Android.bp | 4 ++++ okhttp/Android.bp | 2 ++ protobuf-lite/Android.bp | 2 ++ stub/Android.bp | 2 ++ 6 files changed, 32 insertions(+) diff --git a/Android.bp b/Android.bp index 5a37d3779..1bff084c5 100644 --- a/Android.bp +++ b/Android.bp @@ -78,4 +78,24 @@ java_library { "grpc-java-okhttp", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } + +java_library { + name: "grpc-java-core-android", + host_supported: true, + srcs: [ + "android/src/main/java/io/grpc/android/*.java", + ], + libs: [ + "grpc-java-core", + "grpc-java-core-internal", + "jsr305", + "guava", + ], + sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], +} + diff --git a/context/Android.bp b/context/Android.bp index 814b17a74..98408708f 100644 --- a/context/Android.bp +++ b/context/Android.bp @@ -35,4 +35,6 @@ java_library { "jsr305", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } diff --git a/core/Android.bp b/core/Android.bp index 2267ecb1f..44bd7787a 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -37,6 +37,8 @@ java_library { "guava", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } java_library { @@ -84,6 +86,8 @@ java_library { }, }, sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } java_library { diff --git a/okhttp/Android.bp b/okhttp/Android.bp index 7212a3f57..35d4dc247 100644 --- a/okhttp/Android.bp +++ b/okhttp/Android.bp @@ -42,4 +42,6 @@ java_library { "okhttp-norepackage", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp index 2a2ed945c..983b09421 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/Android.bp @@ -36,4 +36,6 @@ java_library { "libprotobuf-java-lite", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } diff --git a/stub/Android.bp b/stub/Android.bp index 466195dcf..dbd3a7b38 100644 --- a/stub/Android.bp +++ b/stub/Android.bp @@ -36,4 +36,6 @@ java_library { "jsr305", ], sdk_version: "current", + min_sdk_version: "33", + apex_available: ["com.android.adservices"], } -- cgit v1.2.3 From 8a7e7823c00c470a3706a0955983e82114167167 Mon Sep 17 00:00:00 2001 From: David Duarte Date: Thu, 29 Sep 2022 14:58:00 +0000 Subject: Pandora: Move some part of Bluetooth/android/pandora folder to Bluetooth/pandora Test: TreeHugger Bug: 245578454 Change-Id: I7d649044bf0cd3227b6175ec6337231e1cfdbc7b --- Android.bp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 1bff084c5..b2333d047 100644 --- a/Android.bp +++ b/Android.bp @@ -63,7 +63,10 @@ java_library { "grpc-java-protobuf-lite", "grpc-java-stub", ], - visibility: ["//packages/modules/Bluetooth/android/pandora/server"], + visibility: [ + "//packages/modules/Bluetooth/pandora/interfaces", + "//packages/modules/Bluetooth/android/pandora/server", + ], } java_library { -- cgit v1.2.3 From 418811cc4c3644ea58ba6cbaddb6a0bd5ab8d0ae Mon Sep 17 00:00:00 2001 From: David Duarte Date: Thu, 29 Sep 2022 14:58:00 +0000 Subject: Pandora: Move some part of Bluetooth/android/pandora folder to Bluetooth/pandora Test: TreeHugger Bug: 245578454 Change-Id: I7d649044bf0cd3227b6175ec6337231e1cfdbc7b (cherry picked from commit 8a7e7823c00c470a3706a0955983e82114167167) Merged-In: I7d649044bf0cd3227b6175ec6337231e1cfdbc7b --- Android.bp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 5a37d3779..bb18eba88 100644 --- a/Android.bp +++ b/Android.bp @@ -63,7 +63,10 @@ java_library { "grpc-java-protobuf-lite", "grpc-java-stub", ], - visibility: ["//packages/modules/Bluetooth/android/pandora/server"], + visibility: [ + "//packages/modules/Bluetooth/pandora/interfaces", + "//packages/modules/Bluetooth/android/pandora/server", + ], } java_library { -- cgit v1.2.3 From 2de18c7041ac0c913ec09cc7189e466c05cfe0a9 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:30 -0700 Subject: Fix errorprone warnings that should be errors This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I683f8c4fcf262c6866ddecf4a6a7fbc6aadf3d3a --- core/Android.bp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/Android.bp b/core/Android.bp index 44bd7787a..a03c5d765 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -88,6 +88,12 @@ java_library { sdk_version: "current", min_sdk_version: "33", apex_available: ["com.android.adservices"], + + errorprone: { + javacflags: [ + "-Xep:BanJNDI:WARN", + ], + }, } java_library { -- cgit v1.2.3 From bdf51802b2201b84f8f37fe597706b4b8a0abff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Wed, 2 Nov 2022 16:46:45 +0000 Subject: Update OWNERS. Test: N/A Change-Id: Id0d1ab2d69ba32aa8f65945ae5056a77b32e74fe --- OWNERS | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OWNERS b/OWNERS index f678ac24f..fd1e1bf8a 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,3 @@ -# Default code reviewers picked from top 3 or more developers. -# Please update this list if you find better candidates. jdesprez@google.com -yim@google.com +krzysio@google.com +ccross@android.com -- cgit v1.2.3 From dfc8d66971477b7b6ffb1fcff9d66366a19732be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Thu, 29 Sep 2022 08:26:26 +0000 Subject: Update include path for protobuf 21.x. Bug: 203713560 Test: presubmit Change-Id: I0a9abba246c2430a23d4b193cac7eb50089f7462 --- compiler/src/java_plugin/cpp/java_generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp index 519a28aa0..b3706f892 100644 --- a/compiler/src/java_plugin/cpp/java_generator.cpp +++ b/compiler/src/java_plugin/cpp/java_generator.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3 From 4706bd2216ad39e14ea6e67abdaa19a4821565ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sat, 5 Nov 2022 00:48:16 +0000 Subject: Allow gRPC to be used by com.android.devicelock. Bug: 228907574 Test: mm in packages/modules/DeviceLock Change-Id: I9684237e2633f0008e51090be0e49c6d5ecbcec7 --- Android.bp | 3 +-- core/Android.bp | 5 ++++- okhttp/Android.bp | 5 ++++- protobuf-lite/Android.bp | 5 ++++- stub/Android.bp | 5 ++++- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Android.bp b/Android.bp index b2333d047..53ed4626f 100644 --- a/Android.bp +++ b/Android.bp @@ -49,7 +49,7 @@ java_library_host { "grpc-java-protobuf", "grpc-java-protobuf-lite", "grpc-java-stub", - ] + ], } java_library { @@ -101,4 +101,3 @@ java_library { min_sdk_version: "33", apex_available: ["com.android.adservices"], } - diff --git a/core/Android.bp b/core/Android.bp index a03c5d765..2f179fe0a 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -38,7 +38,10 @@ java_library { ], sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], } java_library { diff --git a/okhttp/Android.bp b/okhttp/Android.bp index 35d4dc247..2938092c4 100644 --- a/okhttp/Android.bp +++ b/okhttp/Android.bp @@ -43,5 +43,8 @@ java_library { ], sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], } diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp index 983b09421..20d1b10b1 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/Android.bp @@ -37,5 +37,8 @@ java_library { ], sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], } diff --git a/stub/Android.bp b/stub/Android.bp index dbd3a7b38..2858459e2 100644 --- a/stub/Android.bp +++ b/stub/Android.bp @@ -37,5 +37,8 @@ java_library { ], sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], } -- cgit v1.2.3 From c6cbb3d361e06335a00a52b3e3f42491b64f717c Mon Sep 17 00:00:00 2001 From: Amos Bianchi Date: Fri, 11 Nov 2022 17:01:11 -0800 Subject: Allow grpc-java-core-internal to be used by com.android.devicelock. Bug: 258849404 Test: Build log does not show missing classes. Change-Id: I9d751cda39c4ede1414e9a5c9f44b4da78ded912 --- Android.bp | 10 ++++++++-- context/Android.bp | 5 ++++- core/Android.bp | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Android.bp b/Android.bp index 53ed4626f..2c1707c6d 100644 --- a/Android.bp +++ b/Android.bp @@ -82,7 +82,10 @@ java_library { ], sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], } java_library { @@ -99,5 +102,8 @@ java_library { ], sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], } diff --git a/context/Android.bp b/context/Android.bp index 98408708f..30023005c 100644 --- a/context/Android.bp +++ b/context/Android.bp @@ -36,5 +36,8 @@ java_library { ], sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], } diff --git a/core/Android.bp b/core/Android.bp index 2f179fe0a..18e93692d 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -90,7 +90,10 @@ java_library { }, sdk_version: "current", min_sdk_version: "33", - apex_available: ["com.android.adservices"], + apex_available: [ + "com.android.adservices", + "com.android.devicelock", + ], errorprone: { javacflags: [ -- cgit v1.2.3 From ac942ed0b25dc00606c08ddf161eeacc16384e37 Mon Sep 17 00:00:00 2001 From: Charlie Boutier Date: Wed, 30 Nov 2022 00:46:42 +0000 Subject: [Pandora] - Add visibility for external pandora Test: atest pts-bot Bug: 260774624 Change-Id: I781fbcf7577f304dcc52992e26e6186682a15b28 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index b2333d047..3fb0cecea 100644 --- a/Android.bp +++ b/Android.bp @@ -66,6 +66,7 @@ java_library { visibility: [ "//packages/modules/Bluetooth/pandora/interfaces", "//packages/modules/Bluetooth/android/pandora/server", + "//external/pandora/bt-test-interfaces", ], } -- cgit v1.2.3 From ed55cfca66873069500b4f7b83a6f9db82b6fb76 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 15 Dec 2022 11:18:30 -0800 Subject: Update METADATA file Add third party fields to METADATA file. Test: none Change-Id: I5bcc7f93b8d2ab97eabbc55eef0a5c6fc3a69050 --- METADATA | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/METADATA b/METADATA index d97975ca3..56c454a7c 100644 --- a/METADATA +++ b/METADATA @@ -1,3 +1,16 @@ +name: "grpc-grpc-java" +description: "An RPC library and framework" + third_party { + url { + type: HOMEPAGE + value: "https://grpc.io/" + } + url { + type: GIT + value: "https://github.com/grpc/grpc-java" + } + version: "v1.16.1" + last_upgrade_date: { year: 2020 month: 07 day: 24 } license_type: NOTICE } -- cgit v1.2.3 From 724bb64c2eb5a0f36381f61a377c04bc88ec6c7c Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Sat, 4 Feb 2023 15:29:36 +0000 Subject: Pin tradefed dependencies to Java 11 Bug: 267831518 Test: TH Change-Id: I8aafca14de518c7d32813fd8445e7390f063329f --- annotation-stubs/Android.bp | 2 ++ auth/Android.bp | 2 ++ context/Android.bp | 2 ++ core/Android.bp | 8 ++++++++ protobuf-lite/Android.bp | 2 ++ protobuf/Android.bp | 2 ++ stub/Android.bp | 2 ++ testing/Android.bp | 2 ++ 8 files changed, 22 insertions(+) diff --git a/annotation-stubs/Android.bp b/annotation-stubs/Android.bp index 2f1c39c1b..f22fb103a 100644 --- a/annotation-stubs/Android.bp +++ b/annotation-stubs/Android.bp @@ -29,6 +29,8 @@ java_library { ":grpc-java-annotation-stubs-srcjar", ], sdk_version: "current", + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } gensrcs { diff --git a/auth/Android.bp b/auth/Android.bp index 6d0b6b2a4..50437c5b7 100644 --- a/auth/Android.bp +++ b/auth/Android.bp @@ -33,4 +33,6 @@ java_library_host { "guava", "jsr305", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } diff --git a/context/Android.bp b/context/Android.bp index 98408708f..049f59d08 100644 --- a/context/Android.bp +++ b/context/Android.bp @@ -34,6 +34,8 @@ java_library { "guava", "jsr305", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: ["com.android.adservices"], diff --git a/core/Android.bp b/core/Android.bp index a03c5d765..bb2284fc2 100644 --- a/core/Android.bp +++ b/core/Android.bp @@ -36,6 +36,8 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: ["com.android.adservices"], @@ -54,6 +56,8 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", } @@ -85,6 +89,8 @@ java_library { ], }, }, + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: ["com.android.adservices"], @@ -108,5 +114,7 @@ java_library { "jsr305", "guava", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", } diff --git a/protobuf-lite/Android.bp b/protobuf-lite/Android.bp index 983b09421..06f454c41 100644 --- a/protobuf-lite/Android.bp +++ b/protobuf-lite/Android.bp @@ -35,6 +35,8 @@ java_library { "jsr305", "libprotobuf-java-lite", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: ["com.android.adservices"], diff --git a/protobuf/Android.bp b/protobuf/Android.bp index f51c27200..4f10a5ee7 100644 --- a/protobuf/Android.bp +++ b/protobuf/Android.bp @@ -38,4 +38,6 @@ java_library_host { "libprotobuf-java-full", "libprotobuf-java-util-full", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } diff --git a/stub/Android.bp b/stub/Android.bp index dbd3a7b38..e2e598632 100644 --- a/stub/Android.bp +++ b/stub/Android.bp @@ -35,6 +35,8 @@ java_library { "guava", "jsr305", ], + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", sdk_version: "current", min_sdk_version: "33", apex_available: ["com.android.adservices"], diff --git a/testing/Android.bp b/testing/Android.bp index 2d2a1c6d4..11595de5c 100644 --- a/testing/Android.bp +++ b/testing/Android.bp @@ -45,4 +45,6 @@ java_library { "junit", ], sdk_version: "current", + // b/267831518: Pin tradefed and dependencies to Java 11. + java_version: "11", } -- cgit v1.2.3 From a9dc445fa96cc18f358a9b26f59257a2a463b7d9 Mon Sep 17 00:00:00 2001 From: Qiao Yang Date: Thu, 9 Feb 2023 22:06:31 +0000 Subject: make module `grpc-java-lite` public Test: manual Change-Id: I7b0db356361aec115ebd40c876b6cccc907f84c7 --- Android.bp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Android.bp b/Android.bp index 3fb0cecea..117531629 100644 --- a/Android.bp +++ b/Android.bp @@ -63,11 +63,6 @@ java_library { "grpc-java-protobuf-lite", "grpc-java-stub", ], - visibility: [ - "//packages/modules/Bluetooth/pandora/interfaces", - "//packages/modules/Bluetooth/android/pandora/server", - "//external/pandora/bt-test-interfaces", - ], } java_library { -- cgit v1.2.3 From de7b152bb6d973e79260262fbd0b59e1b3df3bf8 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 2 Mar 2023 15:07:12 -0800 Subject: Remove host_supported from grpc-java-core-android It uses classes from the android sdk, and thus doesn't build for host. This cl requires that usages of this module also not be host supported, so ag/21732630, ag/21732629, and ag/21733520 must be submitted first. Bug: 254205429 Test: Presubmits Change-Id: I12ff79c14813dcd9892158f79b133f570f821ef5 --- Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/Android.bp b/Android.bp index 117531629..fabedd115 100644 --- a/Android.bp +++ b/Android.bp @@ -83,7 +83,6 @@ java_library { java_library { name: "grpc-java-core-android", - host_supported: true, srcs: [ "android/src/main/java/io/grpc/android/*.java", ], -- cgit v1.2.3