Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I26b14bc9175bf07d6dd3b7505a9876927aaf62e1
diff --git a/common/Android.mk b/common/Android.mk
index a0333fc..48f969e 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -24,6 +24,8 @@
android-support-v7-recyclerview \
android-support-v17-leanback
+LOCAL_MIN_SDK_VERSION := 23
+
include $(LOCAL_PATH)/buildconfig.mk
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/jni/gen_jni.sh b/jni/gen_jni.sh
index 2c24618..c06b7b9 100755
--- a/jni/gen_jni.sh
+++ b/jni/gen_jni.sh
@@ -15,4 +15,4 @@
# limitations under the License.
-javah -jni -classpath ../../bin/classes:../../../../../../prebuilts/sdk/current/android.jar -o tunertvinput_jni.h com.android.tv.tuner.TunerHal
+javah -jni -classpath ../../bin/classes:../../../../../../prebuilts/sdk/current/public/android.jar -o tunertvinput_jni.h com.android.tv.tuner.TunerHal
diff --git a/partner_support/Android.mk b/partner_support/Android.mk
index 9a45e70..8306921 100644
--- a/partner_support/Android.mk
+++ b/partner_support/Android.mk
@@ -8,6 +8,7 @@
LOCAL_MODULE_CLASS := STATIC_JAVA_LIBRARIES
LOCAL_MODULE_TAGS := optional
LOCAL_SDK_VERSION := system_current
+LOCAL_MIN_SDK_VERSION := 23
LOCAL_USE_AAPT2 := true
diff --git a/tests/common/Android.mk b/tests/common/Android.mk
index 2e80aa2..3ab16c0 100644
--- a/tests/common/Android.mk
+++ b/tests/common/Android.mk
@@ -11,7 +11,7 @@
android-support-test \
guava \
mockito-target \
- platform-robolectric-3.6.1-prebuilt \
+ platform-robolectric-3.6.2-prebuilt \
truth-0-36-prebuilt-jar \
ub-uiautomator \
diff --git a/tuner/Android.mk b/tuner/Android.mk
index ce17a3c..aedda3c 100644
--- a/tuner/Android.mk
+++ b/tuner/Android.mk
@@ -36,6 +36,8 @@
android-support-tv-provider \
tv-common \
+LOCAL_MIN_SDK_VERSION := 23
+
include $(LOCAL_PATH)/buildconfig.mk
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tuner/tests/testing/Android.mk b/tuner/tests/testing/Android.mk
index 0d71b73..c0d5dda 100644
--- a/tuner/tests/testing/Android.mk
+++ b/tuner/tests/testing/Android.mk
@@ -11,7 +11,7 @@
android-support-test \
guava \
mockito-target \
- platform-robolectric-3.6.1-prebuilt \
+ platform-robolectric-3.6.2-prebuilt \
truth-0-36-prebuilt-jar \
ub-uiautomator \
diff --git a/version.mk b/version.mk
index 57f3a43..375249e 100644
--- a/version.mk
+++ b/version.mk
@@ -58,7 +58,7 @@
#####################################################
#####################################################
# Collect automatic version code parameters
-ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
+ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
# This is an eng build
base_version_buildtype := 0
else
@@ -94,12 +94,12 @@
# and hh is the git hash
# On eng builds, the BUILD_NUMBER has the user and timestamp inline
ifdef TARGET_BUILD_APPS
-ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
+ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h)
date_string := $(shell date +%Y-%m-%d)
version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
else
- version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) ($(BUILD_NUMBER)-$(base_version_arch)$(base_version_density))
+ version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density))
endif
else # !TARGET_BUILD_APPS
version_name_package := $(base_version_major).$(base_version_minor).$(code_version_build)
