lineage-sdk: Run bpfix on our Android.bp files

In particular, fixes packages/LineageSettingsProvider/tests/Android.bp
which otherwise results in errors about unknown properties tags
and instrumentation_for.

Change-Id: I1d44fce77765a77ed6f3c23763f439a216eaefda

5 files changed, 8 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index d83e6b55..a391b5c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,7 +38,7 @@ android_app {
 
     resource_dirs: [
         "lineage/res/res",
-        "sdk/res/res"
+        "sdk/res/res",
     ],
 
     // Create package-export.apk, which other packages can use to get
@@ -46,7 +46,6 @@ android_app {
     export_package_resources: true,
 }
 
-
 // The LineageOS Platform Framework Library
 // ============================================================
 
@@ -101,7 +100,7 @@ java_library {
 // Full target for use by platform apps
 // ============================================================
 
-java_library_static {
+java_library {
     name: "org.lineageos.platform.internal",
     required: ["services"],
     static_libs: [
@@ -125,7 +124,7 @@ java_library_static {
 
 // Included aidl files from lineageos.app namespace
 
-java_library_static {
+java_library {
     name: "org.lineageos.platform.sdk",
     required: ["services"],
     static_libs: lineage_sdk_LOCAL_STATIC_ANDROID_LIBRARIES + lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES,
diff --git a/host/migration/Android.bp b/host/migration/Android.bp
index 08ba98d4..0f90a455 100644
--- a/host/migration/Android.bp
+++ b/host/migration/Android.bp
@@ -15,6 +15,6 @@
 //
 
 java_library_host {
-    srcs: ["**/*.java"],
     name: "migration-interface",
+    srcs: ["**/*.java"],
 }
diff --git a/lineage/jni/Android.bp b/lineage/jni/Android.bp
index 0e48dd30..943856cb 100644
--- a/lineage/jni/Android.bp
+++ b/lineage/jni/Android.bp
@@ -15,6 +15,7 @@
 //
 
 cc_library_shared {
+    name: "liblineage-sdk_platform_jni",
     srcs: [
         "src/org_lineageos_platform_internal_LineageAudioService.cpp",
         "src/onload.cpp",
@@ -37,8 +38,6 @@ cc_library_shared {
         "libutils",
     ],
 
-    name: "liblineage-sdk_platform_jni",
-
     cflags: [
         "-Wall",
         "-Werror",
diff --git a/packages/LineageSettingsProvider/Android.bp b/packages/LineageSettingsProvider/Android.bp
index 5059a5b9..01fef54c 100644
--- a/packages/LineageSettingsProvider/Android.bp
+++ b/packages/LineageSettingsProvider/Android.bp
@@ -15,10 +15,10 @@
 //
 
 android_app {
+    name: "LineageSettingsProvider",
     srcs: ["src/**/*.java"],
     resource_dirs: ["res"],
 
-    name: "LineageSettingsProvider",
     certificate: "platform",
     privileged: true,
 
diff --git a/packages/LineageSettingsProvider/tests/Android.bp b/packages/LineageSettingsProvider/tests/Android.bp
index 2d115382..5a1148c5 100644
--- a/packages/LineageSettingsProvider/tests/Android.bp
+++ b/packages/LineageSettingsProvider/tests/Android.bp
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-android_app {
-    tags: ["tests"],
-
+android_test {
     name: "LineageSettingsProviderTests",
+
     instrumentation_for: "LineageSettingsProvider",
 
     srcs: ["**/*.java"],