commit 65c4d02c848316c985c203b698fbcb4bcbdba305
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 07 01:57:30 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Jul 07 01:57:30 2022 -0700
tree c3bd78be62822cc64751e646c9e0f26c69abcc4d
parent 4393915a376bc76533d8ccf51966db37fe52737a
parent 2f8f28924488e99043e7e8c960526d7153b1f59e

Merge 2f8f28924488e99043e7e8c960526d7153b1f59e on remote branch

Change-Id: I478ba02b7a0b78672993e0ba365caf1e8058d271

scripts/gdbclient.py

diff --git a/scripts/gdbclient.py b/scripts/gdbclient.py
index 83c948a..8c4262d 100755
--- a/scripts/gdbclient.py
+++ b/scripts/gdbclient.py
@@ -317,7 +317,8 @@
     if ":" in device.serial:
         host = device.serial.split(":")[0]
     else:
-        host = "localhost"
+        # lldb is broken with "localhost" right now (http://b/234034124)
+        host = "127.0.0.1"
 
     root = os.environ["ANDROID_BUILD_TOP"]
     sysroot = os.path.join(os.environ["ANDROID_PRODUCT_OUT"], "symbols")

sdk/platform_source.prop_template

diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index fa996c7..34766b7 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,7 +2,7 @@
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 AndroidVersion.ExtensionLevel=${PLATFORM_SDK_EXTENSION_VERSION}