Merge "Support building conscrypt against musl"
diff --git a/Android.bp b/Android.bp
index 4e7927f..bc1be6a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -387,12 +387,21 @@
// version of the API.
dist_stem: "conscrypt",
+ public: {
+ enabled: true,
+ },
+ system: {
+ enabled: true,
+ },
+ module_lib: {
+ enabled: true,
+ },
+
api_dir: "api/public",
api_only: true,
- droiddoc_options: [
- // Emit nullability annotations from the source to the stub files.
- "--include-annotations",
- ],
+
+ // Emit nullability annotations from the source to the stub files.
+ annotations_enabled: true,
java_version: "1.9",
diff --git a/api/public/module-lib-current.txt b/api/public/module-lib-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/public/module-lib-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/public/module-lib-removed.txt b/api/public/module-lib-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/public/module-lib-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/public/system-current.txt b/api/public/system-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/public/system-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/api/public/system-removed.txt b/api/public/system-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/api/public/system-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
