From 206affee00ad7a96e0b82febf28618625971991c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 28 Aug 2024 16:36:02 -0300
Subject: [PATCH] Move AOSP libs to root libs dir

---
 app/build.gradle.kts                |   2 +-
 build.gradle.kts                    |   2 +-
 {app/libs => libs/aosp}/android.jar | Bin
 {app/libs => libs/aosp}/libcore.jar | Bin
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {app/libs => libs/aosp}/android.jar (100%)
 rename {app/libs => libs/aosp}/libcore.jar (100%)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bea343c3..985822f3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -187,7 +187,7 @@ dependencies {
 
 gradle.projectsEvaluated {
     tasks.withType(JavaCompile::class) {
-        options.compilerArgs.add("-Xbootclasspath/p:app/libs/android.jar:app/libs/libcore.jar")
+        options.compilerArgs.add("-Xbootclasspath/p:libs/aosp/android.jar:libs/aosp/libcore.jar")
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index dda10d46..2d2cc46e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 }
 
 val aospLibs by extra {
-    fileTree("$rootDir/app/libs") { // TODO move libs to root
+    fileTree("$rootDir/libs/aosp") {
         // For more information about this module:
         // https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-11.0.0_r3/Android.bp#507
         // framework_intermediates/classes-header.jar works for gradle build as well,
diff --git a/app/libs/android.jar b/libs/aosp/android.jar
similarity index 100%
rename from app/libs/android.jar
rename to libs/aosp/android.jar
diff --git a/app/libs/libcore.jar b/libs/aosp/libcore.jar
similarity index 100%
rename from app/libs/libcore.jar
rename to libs/aosp/libcore.jar