Merge "Adds the Neural Networks lib to the base configuration." into oc-mr1-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 0e8e2cf..ff4d013 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=MASTER
+export BUILD_ID=OC-MR1
diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk
index 0e92153..b5f10cf 100644
--- a/core/install_jni_libs_internal.mk
+++ b/core/install_jni_libs_internal.mk
@@ -116,7 +116,7 @@
else
my_link_type := app:platform
my_warn_types :=
-my_allowed_types := native:ndk native:platform
+my_allowed_types := native:ndk native:platform native:vendor
endif
my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index c83dace..190a889 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -29,7 +29,6 @@
Provision \
SystemUI \
SysuiDarkThemeOverlay \
- SysuiLightWallpaperThemeOverlay \
EasterEgg \
WallpaperCropper
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index 25056c2..0b14203 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -47,7 +47,6 @@
sqlite3 \
SystemUI \
SysuiDarkThemeOverlay \
- SysuiLightWallpaperThemeOverlay \
EasterEgg \
WallpaperPicker \
WidgetPreview