Add TV related packages to userdebug and eng build
Ji-Hwan Lee [Thu, 8 May 2014 06:59:52 +0000 (15:59 +0900)]
Also, adjust packages according to recent changes in build/target/product.

Change-Id: Ia097b5abf2d7bca1f32c3382e3e380ff05d929e8

products/atv_base.mk
products/atv_generic.mk

index 3333bac..d10239e 100644 (file)
 # limitations under the License.
 #
 
-# There packages are still in experimental repository.
-# TODO: Add back when build recovers.
-#PRODUCT_PACKAGES := \
-#    AtscTvInput \
-#    SampleTvInput \
-#    TV \
-#    TvProvider
-
-PRODUCT_PACKAGES := \
+# For now, include TV related packages only for non-user builds.
+# TODO: Add to user build when ready.
+PRODUCT_PACKAGES_DEBUG := \
+    TV \
+    TvProvider \
     tv_input.default
 
 PRODUCT_COPY_FILES := \
@@ -36,7 +32,6 @@ PRODUCT_PACKAGES += \
     ContactsProvider \
     DefaultContainerService \
     UserDictionaryProvider \
-    atrace \
     libaudiopreprocessing \
     libfilterpack_imageproc \
     libgabi++ \
@@ -60,8 +55,7 @@ PRODUCT_PACKAGES += \
     libstagefright_soft_vpxdec \
     libstagefright_soft_vpxenc \
     mdnsd \
-    requestsync \
-    screenrecord
+    requestsync
 
 # From build/target/product/core.mk
 PRODUCT_PACKAGES += \
@@ -86,7 +80,8 @@ PRODUCT_PACKAGES += \
     librs_jni \
     audio.primary.default \
     audio_policy.default \
-    local_time.default
+    local_time.default \
+    screenrecord
 
 PRODUCT_COPY_FILES += \
     frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf
index 0971ebc..f7794f5 100644 (file)
 # limitations under the License.
 #
 
+PRODUCT_PACKAGES_DEBUG := \
+    AtscTvInput \
+    SampleTvInput
+
 PRODUCT_COPY_FILES := \
     $(foreach f,$(wildcard device/google/atv/skins/AndroidTV/*),$(f):skin/$(notdir $(f)))