Revert "[Ravenwood] Internal clean up, more PFD APIs, OsConstant..."
Revert submission 27402077-2024-05-17-PFD
Reason for revert: Broke tests
Reverted changes: /q/submissionid:27402077-2024-05-17-PFD
Change-Id: If2b50329dbcaccb5f13f7631f1fa4df532bfcc60
diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp
index 055a05c..95cbb6b 100644
--- a/ravenwood/Android.bp
+++ b/ravenwood/Android.bp
@@ -56,24 +56,11 @@
visibility: ["//visibility:public"],
}
-java_library {
- name: "ravenwood-runtime-common",
- host_supported: true,
- sdk_version: "core_current",
- srcs: [
- "runtime-common-src/**/*.java",
- ],
- visibility: ["//visibility:private"],
-}
-
java_library_host {
name: "ravenwood-helper-libcore-runtime.host",
srcs: [
"runtime-helper-src/libcore-fake/**/*.java",
],
- static_libs: [
- "ravenwood-runtime-common",
- ],
visibility: ["//visibility:private"],
}
@@ -90,9 +77,6 @@
srcs: [
"runtime-helper-src/framework/**/*.java",
],
- static_libs: [
- "ravenwood-runtime-common",
- ],
libs: [
"framework-minus-apex.ravenwood",
"ravenwood-junit",
@@ -121,7 +105,6 @@
],
static_libs: [
"androidx.test.monitor-for-device",
- "ravenwood-runtime-common",
],
libs: [
"android.test.mock",
@@ -162,9 +145,6 @@
"junit-flag-src/**/*.java",
],
sdk_version: "test_current",
- static_libs: [
- "ravenwood-runtime-common",
- ],
libs: [
"junit",
"flag-junit",
@@ -219,7 +199,7 @@
],
srcs: [
- "runtime-jni/*.cpp",
+ "runtime-helper-src/jni/*.cpp",
],
shared_libs: [