Revert "Remove layoutopt; replaced by the more generic "lint" tool."
This reverts commit 7a23d45cdca22751c421427ce0e4e12df31945d2.
diff --git a/core/main.mk b/core/main.mk
index e35f228..569d4dc 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -441,6 +441,7 @@
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 d44046d..2e7017e 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -134,6 +134,7 @@
gps.mahimahi \
gralloc.default \
gralloc.qsd8k \
+ groovy-all-1.7.0 \
grxmlcompile \
guava \
guavalib \
@@ -170,6 +171,7 @@
layoutlib_api \
layoutlib_create \
layoutlib_utils \
+ layoutopt \
liba2dp \
libabi \
libandroid \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 25cee17..ceb1898 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -77,6 +77,7 @@
ddms \
hierarchyviewer \
draw9patch \
+ layoutopt \
traceview \
android \
dexdump \
@@ -94,6 +95,7 @@
ddmuilib \
draw9patch \
hierarchyviewer \
+ layoutopt \
uix \
traceview \
anttasks \
@@ -102,6 +104,7 @@
sdkmanager \
swtmenubar \
swing-worker-1.1 \
+ groovy-all-1.7.0 \
commons-compress-1.0 \
emmalib \
jcommon-1.0.12 \
