am 9a7bf7ed: am 95ebe7a0: Use the specified verity key to sign boot and recovery OTA images.
* commit '9a7bf7ede4c979cd3b42314562a6da6aab5aa990':
Use the specified verity key to sign boot and recovery OTA images.
diff --git a/core/build_id.mk b/core/build_id.mk
index 00a691f..0e8e2cf 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=LMP
+export BUILD_ID=MASTER
diff --git a/core/pathmap.mk b/core/pathmap.mk
index fbc24b0..0e10ac1 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -107,6 +107,7 @@
#
FRAMEWORKS_SUPPORT_SUBDIRS := \
annotations \
+ media/protocols \
v4 \
v7/gridlayout \
v7/appcompat \
diff --git a/target/product/base.mk b/target/product/base.mk
index 6c495e3..3609d03 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -35,6 +35,7 @@
fsck_msdos \
ime \
input \
+ inputflinger \
javax.obex \
libandroid \
libandroid_runtime \