commit 1ac50c7846b8812096341916b39cb332318e598f
author Steven Moreland <smoreland@google.com> Mon Oct 30 22:24:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 30 22:24:04 2017 +0000
tree 315d185174702d83a3d1267ff51405295cd2f29c
parent 8d98c5e8961f9d473f66fc7904256bb90c2a9591
parent c73896afbaddf055a4045152c5d391d936f54cc0

Merge "Disable legacy hidl static target on PDK builds." am: b2b99bf625
am: c73896afba

Change-Id: I8120ccd130e9b39ab535cd8127ac0a98ce745c59

transport/Android.mk

diff --git a/transport/Android.mk b/transport/Android.mk
index 0c6c3b4..8012835 100644
--- a/transport/Android.mk
+++ b/transport/Android.mk
@@ -5,6 +5,9 @@
 ################################################################################
 LOCAL_PATH:= $(call my-dir)
 
+# TODO(b/68433855): re-enable building this in the PDK
+ifneq ($(TARGET_BUILD_PDK),true)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := android.hidl.base-V1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -53,3 +56,5 @@
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)
 include $(BUILD_STATIC_JAVA_LIBRARY)
+
+endif # TARGET_BUILD_PDK not true