Merge "Update NN types include guards"
diff --git a/METADATA b/METADATA
index 6111a0f..2f3888a 100644
--- a/METADATA
+++ b/METADATA
@@ -1,4 +1,4 @@
third_party {
- # Would be NOTICE save for MPL in runtime/NOTICE
+ license_note: "Would be NOTICE save for MPL in runtime/NOTICE"
license_type: RECIPROCAL
}
diff --git a/apex/Android.bp b/apex/Android.bp
index 7b77f48..464419a 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -39,8 +39,7 @@
apex_defaults {
name: "com.android.neuralnetworks-defaults",
- updatable: true,
- min_sdk_version: "30",
+ defaults: ["r-launched-apex-module"],
androidManifest: ":com.android.neuralnetworks-androidManifest",
native_shared_libs: [
"libneuralnetworks",
diff --git a/runtime/test/Android.bp b/runtime/test/Android.bp
index c39e6a8..b094fb2 100644
--- a/runtime/test/Android.bp
+++ b/runtime/test/Android.bp
@@ -344,28 +344,7 @@
address: true,
},
// Declare explicit library dependency for continuous builds
- target: {
- android_arm: {
- required: [
- "libclang_rt.asan-arm-android",
- ],
- },
- android_arm64: {
- required: [
- "libclang_rt.asan-aarch64-android",
- ],
- },
- android_x86: {
- required: [
- "libclang_rt.asan-i686-android",
- ],
- },
- android_x86_64: {
- required: [
- "libclang_rt.asan-x86_64-android",
- ],
- },
- },
+ required: ["libclang_rt.asan"],
}
// Temporarily disabled due to b/139889855.
