Update make and manifest files to match master branch

PiperOrigin-RevId: 184315365
Change-Id: I7d3ac78adda9f5b7877a78f8268f78ae2f93612a

4 files changed, 3 insertions, 34 deletions

diff --git a/Android.mk b/Android.mk
index 158d1ca3..e92ac4ff 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v14-preference \
     android-support-v17-leanback \
     android-support-v17-preference-leanback \
+    live-channels-partner-support \
     live-tv-tuner \
     tv-common \
 
diff --git a/partner_support/Android.mk b/partner_support/Android.mk
index 413b17e1..9a45e705 100644
--- a/partner_support/Android.mk
+++ b/partner_support/Android.mk
@@ -9,38 +9,14 @@ LOCAL_MODULE_CLASS := STATIC_JAVA_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 LOCAL_SDK_VERSION := system_current
 
+LOCAL_USE_AAPT2 := true
+
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-annotations
-LOCAL_STATIC_JAVA_LIBRARIES += auto-value-jar
-
-# Libraries needed by the compiler (JACK) to generate code.
-PROCESSOR_LIBRARIES_TARGET := \
-    auto-value-jar \
-
-# Resolve the jar paths.
-PROCESSOR_JARS := $(call java-lib-deps, $(PROCESSOR_LIBRARIES_TARGET))
-# Necessary for annotation processors to work correctly.
-LOCAL_ADDITIONAL_DEPENDENCIES += $(PROCESSOR_JARS)
-
-LOCAL_JACK_FLAGS += --processorpath $(call normalize-path-list,$(PROCESSOR_JARS))
-LOCAL_JAVACFLAGS += -processorpath $(call normalize-path-list,$(PROCESSOR_JARS))
 
 include $(LOCAL_PATH)/buildconfig.mk
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
-
-
-#############################################################
-# Pre-built dependency jars
-#############################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += auto-value-jar:../../../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.jar
-
-
-
diff --git a/partner_support/sample_customization/Android.mk b/partner_support/sample_customization/Android.mk
index 8831f5be..11ed13b0 100644
--- a/partner_support/sample_customization/Android.mk
+++ b/partner_support/sample_customization/Android.mk
@@ -1,9 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-# Include all java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
 LOCAL_PACKAGE_NAME := PartnerSupportSampleCustomization
 LOCAL_MODULE_TAGS := optional
 
diff --git a/tuner/SampleDvbTuner/AndroidManifest.xml b/tuner/SampleDvbTuner/AndroidManifest.xml
index cf4d1600..1afc1ebb 100755
--- a/tuner/SampleDvbTuner/AndroidManifest.xml
+++ b/tuner/SampleDvbTuner/AndroidManifest.xml
@@ -23,7 +23,6 @@
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-s
     <uses-permission android:name="android.permission.READ_CONTENT_RATING_SYSTEMS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_TV_LISTINGS" />
@@ -58,10 +57,6 @@ s
             android:exported="false"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-
         <activity
             android:name="com.android.tv.tuner.sample.dvb.setup.SampleDvbTunerSetupActivity"
             android:configChanges="keyboard|keyboardHidden"