Android: Always use public SDK for generate_jni & aidl

These tools generate native code, so we want to stick with public
versions.

Bug: 452971335
Change-Id: I35867901dd38cc73e213657798da09b58e783b97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7069592
Reviewed-by: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1533645}
NOKEYCHECK=True
GitOrigin-RevId: bcc07eb96d9d599bbe2bffef5b98eb13002f2f48

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 5fe8fc9..1da57eb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -43,8 +43,9 @@
       if (defined(invoker.input_jars_paths)) {
         input_jars_paths = invoker.input_jars_paths
       } else {
-        input_jars_paths =
-            [ "${android_sdk}/optional/${invoker.library_name}.jar" ]
+        input_jars_paths = [
+          "${android_sdk_platform_root}/optional/${invoker.library_name}.jar",
+        ]
       }
 
       # Adds the <uses-library> tag to the manifest.
@@ -81,6 +82,8 @@
 
 if (android_ndk_api_level >= 29) {
   config("libbinder_include") {
-    include_dirs = [ "$android_sdk/optional/libbinder_ndk_cpp/" ]
+    # Use public SDK to ensure LGPL-licensed code can be built without the
+    # internal SDK.
+    include_dirs = [ "$public_android_sdk_platform_root/optional/libbinder_ndk_cpp/" ]
   }
 }