commit 0c3b94e9716c9494b902f4c25cae10f2216fcf76
author Quang Luong <qal@google.com> Fri Mar 19 16:55:23 2021 +0000
committer Quang Luong <qal@google.com> Fri Mar 19 16:55:23 2021 +0000
tree c0af7e0a464668494c23c896ffa9fa607eac3fd3
parent caa5c1296aa6ce5f0e1ff943d203a64383b40ff7

Revert "Update min_sdk_versions to match WifiTrackerLib"

Revert "Update GoogleWifiTrackerLib min_sdk_version to match Wif..."

Revert "[WifiTrackerLib] Put @hide methods in separate wrapper p..."

Revert "Update TwoPanelSettingsLib min_sdk_version to match Sett..."

Revert "Update BluetoothServices min_sdk_version to match Settin..."

Revert "Update DroidTwoPanelSettingsLib min_sdk_version to match..."

Revert submission 13842044-wifitrackerlib-hideapi

Reason for revert: build breakage
Reverted Changes:
I85b8ed34a:[WifiTrackerLib] Put @hide methods in separate wra...
I891f51aab:Update DroidTwoPanelSettingsLib min_sdk_version to...
If8e82e047:Update GoogleWifiTrackerLib min_sdk_version to mat...
I4529627fb:Update BluetoothServices min_sdk_version to match ...
I87b46a09b:Update TwoPanelSettingsLib min_sdk_version to matc...
I65a3246b4:Update min_sdk_versions to match WifiTrackerLib

Change-Id: I083b764b42e5cf5476b1ec9ed3a9b2d5ed12afc9

libs/WindowManager/Shell/Android.bp

diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp
index 71b6086..1b5dc8b 100644
--- a/libs/WindowManager/Shell/Android.bp
+++ b/libs/WindowManager/Shell/Android.bp
@@ -55,13 +55,13 @@
     ],
     tools: ["protologtool"],
     cmd: "$(location protologtool) transform-protolog-calls " +
-        "--protolog-class com.android.internal.protolog.common.ProtoLog " +
-        "--protolog-impl-class com.android.wm.shell.protolog.ShellProtoLogImpl " +
-        "--protolog-cache-class com.android.wm.shell.protolog.ShellProtoLogCache " +
-        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
-        "--loggroups-jar $(location :wm_shell_protolog-groups) " +
-        "--output-srcjar $(out) " +
-        "$(locations :wm_shell-sources)",
+      "--protolog-class com.android.internal.protolog.common.ProtoLog " +
+      "--protolog-impl-class com.android.wm.shell.protolog.ShellProtoLogImpl " +
+      "--protolog-cache-class com.android.wm.shell.protolog.ShellProtoLogCache " +
+      "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
+      "--loggroups-jar $(location :wm_shell_protolog-groups) " +
+      "--output-srcjar $(out) " +
+      "$(locations :wm_shell-sources)",
     out: ["wm_shell_protolog.srcjar"],
 }
 
@@ -73,14 +73,13 @@
     ],
     tools: ["protologtool"],
     cmd: "$(location protologtool) generate-viewer-config " +
-        "--protolog-class com.android.internal.protolog.common.ProtoLog " +
-        "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
-        "--loggroups-jar $(location :wm_shell_protolog-groups) " +
-        "--viewer-conf $(out) " +
-        "$(locations :wm_shell-sources)",
+      "--protolog-class com.android.internal.protolog.common.ProtoLog " +
+      "--loggroups-class com.android.wm.shell.protolog.ShellProtoLogGroup " +
+      "--loggroups-jar $(location :wm_shell_protolog-groups) " +
+      "--viewer-conf $(out) " +
+      "$(locations :wm_shell-sources)",
     out: ["wm_shell_protolog.json"],
 }
-
 // End ProtoLog
 
 java_library {
@@ -105,7 +104,7 @@
         "res",
     ],
     java_resources: [
-        ":generate-wm_shell_protolog.json",
+        ":generate-wm_shell_protolog.json"
     ],
     static_libs: [
         "androidx.appcompat_appcompat",
@@ -118,10 +117,10 @@
         "protolog-lib",
         "SettingsLib",
         "WindowManager-Shell-proto",
-        "jsr330",
+        "jsr330"
     ],
     kotlincflags: ["-Xjvm-default=enable"],
     manifest: "AndroidManifest.xml",
 
-    min_sdk_version: "30",
+    min_sdk_version: "26",
 }