Merge changes I25c77994,I7da78ef4,I89197d0a
* changes:
Support adding extra lint checks
Allow kotlin modules to skip packaging the kotlin stdlib
Fix annotation processors in kotlin modules that generate resources
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 7ce0912..cc51e3a 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1088,9 +1088,12 @@
props := struct {
Name *string
Visibility []string
+ Instrument bool
}{
Name: proptools.StringPtr(module.implLibraryModuleName()),
Visibility: module.sdkLibraryProperties.Impl_library_visibility,
+ // Set the instrument property to ensure it is instrumented when instrumentation is required.
+ Instrument: true,
}
properties := []interface{}{
diff --git a/scripts/build-mainline-modules.sh b/scripts/build-mainline-modules.sh
index df763c8..9b68a82 100755
--- a/scripts/build-mainline-modules.sh
+++ b/scripts/build-mainline-modules.sh
@@ -21,6 +21,8 @@
conscrypt-module-host-exports
runtime-module-sdk
runtime-module-host-exports
+ i18n-module-test-exports
+ i18n-module-sdk
)
# We want to create apex modules for all supported architectures.