summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Rassieur <rassb@google.com>2019-03-29 04:12:40 +0000
committerBill Rassieur <rassb@google.com>2019-03-29 04:12:40 +0000
commitd7519bdaa95c6e2381d1bcc9d17df855df7adf70 (patch)
tree28692b3b57400d37012ad306498ccafa6b125838
parentb706a13ecc204aced0c9aaea1c659cded88d0f51 (diff)
parent184d18d0d6fcc547c94b85acef4b5a86445464ee (diff)
downloadhikey-d7519bdaa95c6e2381d1bcc9d17df855df7adf70.tar.gz
Merge master@5406228 into git_qt-dev-plus-aosp.
Change-Id: I683fd56f428a7914d99b80994e83ac3bb093ab4d BUG: 129345239
-rw-r--r--recovery/Android.bp5
-rw-r--r--recovery/recovery_ui.cpp4
2 files changed, 5 insertions, 4 deletions
diff --git a/recovery/Android.bp b/recovery/Android.bp
index 17dde5f0..0fd89068 100644
--- a/recovery/Android.bp
+++ b/recovery/Android.bp
@@ -26,7 +26,8 @@ cc_library_static {
srcs: [
"recovery_ui.cpp",
],
- include_dirs: [
- "bootable/recovery"
+
+ shared_libs: [
+ "librecovery_ui",
],
}
diff --git a/recovery/recovery_ui.cpp b/recovery/recovery_ui.cpp
index d67ff5f8..e82be6a6 100644
--- a/recovery/recovery_ui.cpp
+++ b/recovery/recovery_ui.cpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#include <device.h>
-#include <screen_ui.h>
+#include <recovery_ui/device.h>
+#include <recovery_ui/screen_ui.h>
namespace android {
namespace device {