Update test .bp files
Test: m CtsIcuTestCases CtsIcu4cTestCases
Change-Id: I5784c1bd35d10f1411b2bace42534b7579507cc4
diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index c206515..33745be 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -468,6 +468,7 @@
"core-icu4j",
],
static_libs: [
+ "gson",
"junit",
"junit-params",
"tzdata-testing",
diff --git a/icu4c/source/io/Android.bp b/icu4c/source/io/Android.bp
new file mode 100644
index 0000000..253ba48
--- /dev/null
+++ b/icu4c/source/io/Android.bp
@@ -0,0 +1,41 @@
+// Copyright (C) 2024 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ default_team: "trendy_team_java_core_libraries",
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_icu_icu4c_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Unicode-DFS
+ default_applicable_licenses: ["external_icu_icu4c_license"],
+}
+
+cc_library_static {
+ name: "libicuio",
+ cppflags: [
+ "-DU_IO_IMPLEMENTATION",
+ "-DANDROID_LINK_SHARED_ICU4C",
+ ],
+ srcs: [
+ "*.c",
+ "*.cpp",
+ ],
+ shared_libs: [
+ "libicuuc",
+ "libicui18n",
+ ],
+ rtti: true,
+ export_include_dirs: ["."],
+}
diff --git a/icu4c/source/test/Android.bp b/icu4c/source/test/Android.bp
index 7216c7d..ba3784a 100644
--- a/icu4c/source/test/Android.bp
+++ b/icu4c/source/test/Android.bp
@@ -53,6 +53,7 @@
static_libs: [
"libicuctest",
+ "libicuio",
"libicutoolutil",
],
target: {
diff --git a/icu4j/Android.bp b/icu4j/Android.bp
index beaca6a..1d72474 100644
--- a/icu4j/Android.bp
+++ b/icu4j/Android.bp
@@ -56,7 +56,7 @@
"-Xep:IdentityBinaryExpression:WARN",
],
},
- sdk_version: "core_current",
+ sdk_version: "current",
}
java_library {
@@ -116,6 +116,7 @@
exclude_java_resource_dirs: ["main/localespi/src/test"],
static_libs: [
+ "gson",
"icu4j",
"icu4j-testdata",
"junit-params",
