commit 29a29875627758aa3c76aa5256641c1782c904bf
author Ying Wang <wangying@google.com> Wed Jan 21 20:04:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 21 20:04:20 2015 +0000
tree 2d616cbcbd12c7d8c86d7d7bc6b06c1b8bd187a2
parent 8be358bf9a5407a379d4c4709c172b8c1ba6d4c7
parent 07acdbfd32f8164c05b0035c80fe16adb5c03280

Merge "Running jarjar on Java resources."

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 8ed46ac..a0a0a59 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -274,8 +274,8 @@
 ifneq ($(filter-out $(INTERNAL_VALID_VARIANTS),$(TARGET_BUILD_VARIANT)),)
 $(info ***************************************************************)
 $(info ***************************************************************)
-$(info Invalid variant: $(TARGET_BUILD_VARIANT)
-$(info Valid values are: $(INTERNAL_VALID_VARIANTS)
+$(info Invalid variant: $(TARGET_BUILD_VARIANT))
+$(info Valid values are: $(INTERNAL_VALID_VARIANTS))
 $(info ***************************************************************)
 $(info ***************************************************************)
 $(error stopping)

target/product/emulator.mk

diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 295dfac..3a8a4aa 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -44,7 +44,8 @@
     e2fsck \
     audio.primary.goldfish \
     vibrator.goldfish \
-    power.goldfish
+    power.goldfish \
+    sensors.ranchu
 
 
 PRODUCT_COPY_FILES += \