gn2bp: Set sdk_verion and add required libs to cronet_aml_java
Test: ./update_results.sh, m cronet_aml_java
Change-Id: I653458bcb8b3006c6dd4ae6ad507e9b3f6dcded1
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index d3afbb2..4941d40 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -9853,6 +9853,11 @@
"androidx.annotation_annotation",
"androidx.collection_collection",
"androidx.core_core",
+ "framework-connectivity-t.stubs.module_lib",
+ "framework-connectivity.stubs.module_lib",
+ "framework-mediaprovider.stubs.module_lib",
+ "framework-tethering.stubs.module_lib",
+ "framework-wifi.stubs.module_lib",
"jsr305",
],
aidl: {
@@ -9866,6 +9871,7 @@
plugins: [
"cronet_aml_java_jni_annotation_preprocessor",
],
+ sdk_version: "module_current",
}
// GN: //base/android/jni_generator:jni_processor
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 247d494..55f8339 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1343,9 +1343,15 @@
"androidx.core_core",
"androidx.collection_collection",
"android-support-multidex",
+ "framework-connectivity.stubs.module_lib",
+ "framework-connectivity-t.stubs.module_lib",
+ "framework-tethering.stubs.module_lib",
+ "framework-wifi.stubs.module_lib",
+ "framework-mediaprovider.stubs.module_lib",
}
module.aidl["include_dirs"] = {"frameworks/base/core/java/"}
module.aidl["local_include_dirs"] = {"base/android/java/src/"}
+ module.sdk_version = "module_current"
for dep in gn.java_actions:
target = gn.get_target(dep)
if target.script == '//build/android/gyp/gcc_preprocess.py':