summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Hansson2018-02-23 09:50:29 -0600
committerAnton Hansson2018-02-28 05:15:00 -0600
commita526bfa14b168635d010ae1262a7c4a53f7f6af3 (patch)
treef60ae40f3fe4ec5483a1f7f890de1cc669f8858d
parent30450c9388d5713f5d5bdd74d04a5e0bdf4f50b9 (diff)
downloadplatform-packages-services-car-a526bfa14b168635d010ae1262a7c4a53f7f6af3.tar.gz
platform-packages-services-car-a526bfa14b168635d010ae1262a7c4a53f7f6af3.tar.xz
platform-packages-services-car-a526bfa14b168635d010ae1262a7c4a53f7f6af3.zip
packages/services/Car: Set LOCAL_SDK_VERSION where possible.android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7
This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: Ifd1afb4186d8f840194df9ab3e7a30a08e61514f Merged-In: I1e77ed30aa2b67a6b8640a23fc42c28b0445bf29
-rw-r--r--TrustAgent/Android.mk1
-rw-r--r--car-cluster-logging-renderer/Android.mk1
-rw-r--r--car-default-input-service/Android.mk1
-rw-r--r--car-maps-placeholder/Android.mk2
-rw-r--r--car-usb-handler/Android.mk1
-rw-r--r--service/Android.mk1
-rw-r--r--tests/CarDiagnosticVerifier/Android.mk1
-rw-r--r--tests/DirectRenderingClusterSample/Android.mk1
-rw-r--r--tests/EmbeddedKitchenSinkApp/Android.mk1
-rw-r--r--tests/InstrumentClusterRendererSample/Android.mk1
-rw-r--r--tests/VmsPublisherClientSample/Android.mk1
-rw-r--r--tests/VmsSubscriberClientSample/Android.mk1
-rw-r--r--tests/android_car_api_test/Android.mk1
-rw-r--r--tests/android_support_car_api_test/Android.mk1
-rw-r--r--tests/carservice_test/Android.mk1
-rw-r--r--tests/carservice_unit_test/Android.mk1
-rw-r--r--tests/obd2_app/Android.mk1
-rw-r--r--tests/obd2_test/Android.mk1
-rw-r--r--tests/usb/AoapHostApp/Android.mk1
-rw-r--r--tests/vehiclehal_test/Android.mk1
20 files changed, 21 insertions, 0 deletions
diff --git a/TrustAgent/Android.mk b/TrustAgent/Android.mk
index a57308a1..4308a1dd 100644
--- a/TrustAgent/Android.mk
+++ b/TrustAgent/Android.mk
@@ -23,6 +23,7 @@ LOCAL_USE_AAPT2 := true
23LOCAL_SRC_FILES := $(call all-java-files-under, src) 23LOCAL_SRC_FILES := $(call all-java-files-under, src)
24 24
25LOCAL_PACKAGE_NAME := CarTrustAgentService 25LOCAL_PACKAGE_NAME := CarTrustAgentService
26LOCAL_PRIVATE_PLATFORM_APIS := true
26 27
27LOCAL_PRIVILEGED_MODULE := true 28LOCAL_PRIVILEGED_MODULE := true
28 29
diff --git a/car-cluster-logging-renderer/Android.mk b/car-cluster-logging-renderer/Android.mk
index dd1d0cab..27b0bbc7 100644
--- a/car-cluster-logging-renderer/Android.mk
+++ b/car-cluster-logging-renderer/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := android.car.cluster.loggingrenderer 23LOCAL_PACKAGE_NAME := android.car.cluster.loggingrenderer
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25# Each update should be signed by OEMs 26# Each update should be signed by OEMs
26LOCAL_CERTIFICATE := platform 27LOCAL_CERTIFICATE := platform
diff --git a/car-default-input-service/Android.mk b/car-default-input-service/Android.mk
index 59ef91c8..fc99bfa2 100644
--- a/car-default-input-service/Android.mk
+++ b/car-default-input-service/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := android.car.input.service 23LOCAL_PACKAGE_NAME := android.car.input.service
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25# Each update should be signed by OEMs 26# Each update should be signed by OEMs
26LOCAL_CERTIFICATE := platform 27LOCAL_CERTIFICATE := platform
diff --git a/car-maps-placeholder/Android.mk b/car-maps-placeholder/Android.mk
index 53cdbf8b..f2561f90 100644
--- a/car-maps-placeholder/Android.mk
+++ b/car-maps-placeholder/Android.mk
@@ -25,6 +25,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
25LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 25LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
26 26
27LOCAL_PACKAGE_NAME := CarMapsPlaceholder 27LOCAL_PACKAGE_NAME := CarMapsPlaceholder
28# TODO(b/73535841): Can build against current once the car stubs exist.
29LOCAL_PRIVATE_PLATFORM_APIS := true
28 30
29LOCAL_CERTIFICATE := platform 31LOCAL_CERTIFICATE := platform
30 32
diff --git a/car-usb-handler/Android.mk b/car-usb-handler/Android.mk
index 31942506..4d1a5779 100644
--- a/car-usb-handler/Android.mk
+++ b/car-usb-handler/Android.mk
@@ -24,6 +24,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
24LOCAL_SRC_FILES := $(call all-java-files-under, src) 24LOCAL_SRC_FILES := $(call all-java-files-under, src)
25 25
26LOCAL_PACKAGE_NAME := CarUsbHandler 26LOCAL_PACKAGE_NAME := CarUsbHandler
27LOCAL_PRIVATE_PLATFORM_APIS := true
27 28
28# Each update should be signed by OEMs 29# Each update should be signed by OEMs
29LOCAL_CERTIFICATE := platform 30LOCAL_CERTIFICATE := platform
diff --git a/service/Android.mk b/service/Android.mk
index 2b926dff..413f3437 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -28,6 +28,7 @@ include $(CLEAR_VARS)
28LOCAL_SRC_FILES := $(car_service_sources) 28LOCAL_SRC_FILES := $(car_service_sources)
29 29
30LOCAL_PACKAGE_NAME := CarService 30LOCAL_PACKAGE_NAME := CarService
31LOCAL_PRIVATE_PLATFORM_APIS := true
31 32
32# Each update should be signed by OEMs 33# Each update should be signed by OEMs
33LOCAL_CERTIFICATE := platform 34LOCAL_CERTIFICATE := platform
diff --git a/tests/CarDiagnosticVerifier/Android.mk b/tests/CarDiagnosticVerifier/Android.mk
index a0064762..780fa6a4 100644
--- a/tests/CarDiagnosticVerifier/Android.mk
+++ b/tests/CarDiagnosticVerifier/Android.mk
@@ -27,6 +27,7 @@ LOCAL_RESOURCE_DIR := \
27 $(TOP)/frameworks/support/v7/recyclerview/res \ 27 $(TOP)/frameworks/support/v7/recyclerview/res \
28 28
29LOCAL_PACKAGE_NAME := CarDiagnosticVerifier 29LOCAL_PACKAGE_NAME := CarDiagnosticVerifier
30LOCAL_PRIVATE_PLATFORM_APIS := true
30 31
31LOCAL_AAPT_FLAGS := --auto-add-overlay \ 32LOCAL_AAPT_FLAGS := --auto-add-overlay \
32 --extra-packages android.support.v7.recyclerview \ 33 --extra-packages android.support.v7.recyclerview \
diff --git a/tests/DirectRenderingClusterSample/Android.mk b/tests/DirectRenderingClusterSample/Android.mk
index 7fb6e8e2..9253d1f5 100644
--- a/tests/DirectRenderingClusterSample/Android.mk
+++ b/tests/DirectRenderingClusterSample/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := DirectRenderingClusterSample 23LOCAL_PACKAGE_NAME := DirectRenderingClusterSample
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25# Each update should be signed by OEMs 26# Each update should be signed by OEMs
26LOCAL_CERTIFICATE := platform 27LOCAL_CERTIFICATE := platform
diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index 37c79f75..93745c0b 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
26LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 26LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
27 27
28LOCAL_PACKAGE_NAME := EmbeddedKitchenSinkApp 28LOCAL_PACKAGE_NAME := EmbeddedKitchenSinkApp
29LOCAL_PRIVATE_PLATFORM_APIS := true
29 30
30LOCAL_AAPT_FLAGS := --auto-add-overlay 31LOCAL_AAPT_FLAGS := --auto-add-overlay
31 32
diff --git a/tests/InstrumentClusterRendererSample/Android.mk b/tests/InstrumentClusterRendererSample/Android.mk
index f00200f8..4d26ba32 100644
--- a/tests/InstrumentClusterRendererSample/Android.mk
+++ b/tests/InstrumentClusterRendererSample/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := InstrumentClusterRendererSampleImpl 23LOCAL_PACKAGE_NAME := InstrumentClusterRendererSampleImpl
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25# Each update should be signed by OEMs 26# Each update should be signed by OEMs
26LOCAL_CERTIFICATE := platform 27LOCAL_CERTIFICATE := platform
diff --git a/tests/VmsPublisherClientSample/Android.mk b/tests/VmsPublisherClientSample/Android.mk
index 2aa6c401..8c5ada8b 100644
--- a/tests/VmsPublisherClientSample/Android.mk
+++ b/tests/VmsPublisherClientSample/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
23LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 23LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
24 24
25LOCAL_PACKAGE_NAME := VmsPublisherClientSample 25LOCAL_PACKAGE_NAME := VmsPublisherClientSample
26LOCAL_PRIVATE_PLATFORM_APIS := true
26 27
27LOCAL_MODULE_TAGS := optional 28LOCAL_MODULE_TAGS := optional
28 29
diff --git a/tests/VmsSubscriberClientSample/Android.mk b/tests/VmsSubscriberClientSample/Android.mk
index f59e2679..c577aaf3 100644
--- a/tests/VmsSubscriberClientSample/Android.mk
+++ b/tests/VmsSubscriberClientSample/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
23LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 23LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
24 24
25LOCAL_PACKAGE_NAME := VmsSubscriberClientSample 25LOCAL_PACKAGE_NAME := VmsSubscriberClientSample
26LOCAL_PRIVATE_PLATFORM_APIS := true
26 27
27LOCAL_MODULE_TAGS := optional 28LOCAL_MODULE_TAGS := optional
28 29
diff --git a/tests/android_car_api_test/Android.mk b/tests/android_car_api_test/Android.mk
index 58a12885..3196b4f1 100644
--- a/tests/android_car_api_test/Android.mk
+++ b/tests/android_car_api_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := AndroidCarApiTest 23LOCAL_PACKAGE_NAME := AndroidCarApiTest
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25# for system|priviledged permission. 26# for system|priviledged permission.
26LOCAL_CERTIFICATE := platform 27LOCAL_CERTIFICATE := platform
diff --git a/tests/android_support_car_api_test/Android.mk b/tests/android_support_car_api_test/Android.mk
index bf7db848..767401f9 100644
--- a/tests/android_support_car_api_test/Android.mk
+++ b/tests/android_support_car_api_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := AndroidSupportCarApiTest 23LOCAL_PACKAGE_NAME := AndroidSupportCarApiTest
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25# for system|privileged permission. 26# for system|privileged permission.
26LOCAL_CERTIFICATE := platform 27LOCAL_CERTIFICATE := platform
diff --git a/tests/carservice_test/Android.mk b/tests/carservice_test/Android.mk
index 4be53548..95e1404f 100644
--- a/tests/carservice_test/Android.mk
+++ b/tests/carservice_test/Android.mk
@@ -25,6 +25,7 @@ LOCAL_RESOURCE_DIR += packages/services/Car/service/res
25LOCAL_AAPT_FLAGS += --extra-packages com.android.car --auto-add-overlay 25LOCAL_AAPT_FLAGS += --extra-packages com.android.car --auto-add-overlay
26 26
27LOCAL_PACKAGE_NAME := CarServiceTest 27LOCAL_PACKAGE_NAME := CarServiceTest
28LOCAL_PRIVATE_PLATFORM_APIS := true
28 29
29# for system|priviledged permission. 30# for system|priviledged permission.
30LOCAL_CERTIFICATE := platform 31LOCAL_CERTIFICATE := platform
diff --git a/tests/carservice_unit_test/Android.mk b/tests/carservice_unit_test/Android.mk
index 1ec20085..4b28475a 100644
--- a/tests/carservice_unit_test/Android.mk
+++ b/tests/carservice_unit_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := CarServiceUnitTest 23LOCAL_PACKAGE_NAME := CarServiceUnitTest
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25LOCAL_CERTIFICATE := platform 26LOCAL_CERTIFICATE := platform
26 27
diff --git a/tests/obd2_app/Android.mk b/tests/obd2_app/Android.mk
index 7e1e22fa..094a6b8d 100644
--- a/tests/obd2_app/Android.mk
+++ b/tests/obd2_app/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
23LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 23LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
24 24
25LOCAL_PACKAGE_NAME := Obd2App 25LOCAL_PACKAGE_NAME := Obd2App
26LOCAL_PRIVATE_PLATFORM_APIS := true
26 27
27LOCAL_AAPT_FLAGS := --auto-add-overlay 28LOCAL_AAPT_FLAGS := --auto-add-overlay
28 29
diff --git a/tests/obd2_test/Android.mk b/tests/obd2_test/Android.mk
index 198a69ac..06ffe31e 100644
--- a/tests/obd2_test/Android.mk
+++ b/tests/obd2_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := com.android.car.obd2.test 23LOCAL_PACKAGE_NAME := com.android.car.obd2.test
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25LOCAL_CERTIFICATE := platform 26LOCAL_CERTIFICATE := platform
26 27
diff --git a/tests/usb/AoapHostApp/Android.mk b/tests/usb/AoapHostApp/Android.mk
index 7dbd2332..e3351601 100644
--- a/tests/usb/AoapHostApp/Android.mk
+++ b/tests/usb/AoapHostApp/Android.mk
@@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
25LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res 25LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
26 26
27LOCAL_PACKAGE_NAME := AoapHostApp 27LOCAL_PACKAGE_NAME := AoapHostApp
28LOCAL_PRIVATE_PLATFORM_APIS := true
28 29
29LOCAL_MODULE_TAGS := optional 30LOCAL_MODULE_TAGS := optional
30LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) 31LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
diff --git a/tests/vehiclehal_test/Android.mk b/tests/vehiclehal_test/Android.mk
index cbc6ff1d..57afcf17 100644
--- a/tests/vehiclehal_test/Android.mk
+++ b/tests/vehiclehal_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
21LOCAL_SRC_FILES := $(call all-java-files-under, src) 21LOCAL_SRC_FILES := $(call all-java-files-under, src)
22 22
23LOCAL_PACKAGE_NAME := VehicleHALTest 23LOCAL_PACKAGE_NAME := VehicleHALTest
24LOCAL_PRIVATE_PLATFORM_APIS := true
24 25
25LOCAL_CERTIFICATE := platform 26LOCAL_CERTIFICATE := platform
26 27