am 96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '96a228bd7904b83274575522a267d178b3da2341':
Remove mention of layoutopt/uix as they are gone.
diff --git a/core/main.mk b/core/main.mk
index 380fb1d..348ee3b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -445,7 +445,6 @@
sdk/ide_common \
sdk/jarutils \
sdk/layoutlib_api \
- sdk/layoutopt \
sdk/ninepatch \
sdk/rule_api \
sdk/lint \
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 2e7017e..b88e541 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -171,7 +171,6 @@
layoutlib_api \
layoutlib_create \
layoutlib_utils \
- layoutopt \
liba2dp \
libabi \
libandroid \
@@ -494,7 +493,6 @@
traceview \
tune2fs \
tune2fs_host \
- uix \
usbtest \
vdc \
vm-tests \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index ceb1898..d2f4c09 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -77,7 +77,6 @@
ddms \
hierarchyviewer \
draw9patch \
- layoutopt \
traceview \
android \
dexdump \
@@ -95,8 +94,6 @@
ddmuilib \
draw9patch \
hierarchyviewer \
- layoutopt \
- uix \
traceview \
anttasks \
sdklib \