Fix cf_x86_phone boot

Several weeks ago I did some build system rationalization which subtly broke cuttlefish. Unfortunately nothing screamed very loudly so we didn't notice. - Place the libraries in the correct directory - Use libarect (static lib for this purpose) rather than libui (which is inaccessible to sphal even though the build system will allow it) Bug: b/141209513 Change-Id: I4e9010bfb83686a876968daab8e99df736d4b1e8 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/36451Tested-by: Chris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com>

Fix cf_x86_phone boot
e7043257 · Chris Forbes · 61a27659 · e7043257
Commit e7043257 authored Sep 17, 2019 by Chris Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Android.bp src/Android.bp +4 -2

No files found.
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -44,7 +44,7 @@ cc_defaults {

    target: {
        android: {
-            relative_install_path: "hw",
+            relative_install_path: "egl",
            header_libs: [
                "swiftshader_platform_headers",
 		"libnativebase_headers",
@@ -55,7 +55,9 @@ cc_defaults {
                "libcutils",
                "libsync",
                "liblog",
-		"libui",
+            ],
+            static_libs: [
+                "libarect",
            ],
        },