packages/services/Car: Set LOCAL_SDK_VERSION where possible.

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: I1e77ed30aa2b67a6b8640a23fc42c28b0445bf29

22 files changed, 23 insertions, 0 deletions

diff --git a/TrustAgent/Android.mk b/TrustAgent/Android.mk
index a57308a163..4308a1dd19 100644
--- a/TrustAgent/Android.mk
+++ b/TrustAgent/Android.mk
@@ -23,6 +23,7 @@ LOCAL_USE_AAPT2 := true
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CarTrustAgentService
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_PRIVILEGED_MODULE := true
 
diff --git a/car-cluster-logging-renderer/Android.mk b/car-cluster-logging-renderer/Android.mk
index dd1d0cab4e..27b0bbc77f 100644
--- a/car-cluster-logging-renderer/Android.mk
+++ b/car-cluster-logging-renderer/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := android.car.cluster.loggingrenderer
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Each update should be signed by OEMs
 LOCAL_CERTIFICATE := platform
diff --git a/car-default-input-service/Android.mk b/car-default-input-service/Android.mk
index 59ef91c8ad..fc99bfa212 100644
--- a/car-default-input-service/Android.mk
+++ b/car-default-input-service/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := android.car.input.service
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Each update should be signed by OEMs
 LOCAL_CERTIFICATE := platform
diff --git a/car-maps-placeholder/Android.mk b/car-maps-placeholder/Android.mk
index 222ff59fd0..dad19abfcc 100644
--- a/car-maps-placeholder/Android.mk
+++ b/car-maps-placeholder/Android.mk
@@ -27,6 +27,8 @@ LOCAL_USE_AAPT2 := true
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := CarMapsPlaceholder
+# TODO(b/73535841): Can build against current once the car stubs exist.
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_STATIC_ANDROID_LIBRARIES := $(ANDROID_SUPPORT_CAR_TARGETS)
 
diff --git a/car-usb-handler/Android.mk b/car-usb-handler/Android.mk
index 3194250651..4d1a577951 100644
--- a/car-usb-handler/Android.mk
+++ b/car-usb-handler/Android.mk
@@ -24,6 +24,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CarUsbHandler
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Each update should be signed by OEMs
 LOCAL_CERTIFICATE := platform
diff --git a/service/Android.mk b/service/Android.mk
index bfbe146448..c03042d60a 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -28,6 +28,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(car_service_sources)
 
 LOCAL_PACKAGE_NAME := CarService
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Each update should be signed by OEMs
 LOCAL_CERTIFICATE := platform
diff --git a/tests/CarDiagnosticVerifier/Android.mk b/tests/CarDiagnosticVerifier/Android.mk
index 0ec2fe26ba..6b6cc54fbc 100644
--- a/tests/CarDiagnosticVerifier/Android.mk
+++ b/tests/CarDiagnosticVerifier/Android.mk
@@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := CarDiagnosticVerifier
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_JAVA_VERSION := 1.8
 
diff --git a/tests/DefaultStorageMonitoringCompanionApp/Android.mk b/tests/DefaultStorageMonitoringCompanionApp/Android.mk
index 8eb2a55288..ff28cf61d2 100644
--- a/tests/DefaultStorageMonitoringCompanionApp/Android.mk
+++ b/tests/DefaultStorageMonitoringCompanionApp/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := DefaultStorageMonitoringCompanionApp
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 
diff --git a/tests/DirectRenderingClusterSample/Android.mk b/tests/DirectRenderingClusterSample/Android.mk
index 7fb6e8e269..9253d1f5a7 100644
--- a/tests/DirectRenderingClusterSample/Android.mk
+++ b/tests/DirectRenderingClusterSample/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := DirectRenderingClusterSample
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Each update should be signed by OEMs
 LOCAL_CERTIFICATE := platform
diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index 64084b9736..0833915e99 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -29,6 +29,7 @@ LOCAL_USE_AAPT2 := true
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := EmbeddedKitchenSinkApp
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/tests/InstrumentClusterRendererSample/Android.mk b/tests/InstrumentClusterRendererSample/Android.mk
index f00200f813..4d26ba322c 100644
--- a/tests/InstrumentClusterRendererSample/Android.mk
+++ b/tests/InstrumentClusterRendererSample/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := InstrumentClusterRendererSampleImpl
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Each update should be signed by OEMs
 LOCAL_CERTIFICATE := platform
diff --git a/tests/UxRestrictionsSample/Android.mk b/tests/UxRestrictionsSample/Android.mk
index 283fb9bc81..2ed4258f7a 100644
--- a/tests/UxRestrictionsSample/Android.mk
+++ b/tests/UxRestrictionsSample/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := UxRestrictionsSample
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/tests/VmsPublisherClientSample/Android.mk b/tests/VmsPublisherClientSample/Android.mk
index 2aa6c40194..8c5ada8b6e 100644
--- a/tests/VmsPublisherClientSample/Android.mk
+++ b/tests/VmsPublisherClientSample/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := VmsPublisherClientSample
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/tests/VmsSubscriberClientSample/Android.mk b/tests/VmsSubscriberClientSample/Android.mk
index f59e26794f..c577aaf3f4 100644
--- a/tests/VmsSubscriberClientSample/Android.mk
+++ b/tests/VmsSubscriberClientSample/Android.mk
@@ -23,6 +23,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := VmsSubscriberClientSample
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/tests/android_car_api_test/Android.mk b/tests/android_car_api_test/Android.mk
index 0e98a5d184..b1c2728b7d 100644
--- a/tests/android_car_api_test/Android.mk
+++ b/tests/android_car_api_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := AndroidCarApiTest
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # for system|priviledged permission.
 LOCAL_CERTIFICATE := platform
diff --git a/tests/android_support_car_api_test/Android.mk b/tests/android_support_car_api_test/Android.mk
index 620cec753c..90aa767b37 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)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := AndroidSupportCarApiTest
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # for system|privileged permission.
 LOCAL_CERTIFICATE := platform
diff --git a/tests/carservice_test/Android.mk b/tests/carservice_test/Android.mk
index aac6aa451b..0ed57d477e 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
 LOCAL_AAPT_FLAGS += --extra-packages com.android.car --auto-add-overlay
 
 LOCAL_PACKAGE_NAME := CarServiceTest
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # for system|priviledged permission.
 LOCAL_CERTIFICATE := platform
diff --git a/tests/carservice_unit_test/Android.mk b/tests/carservice_unit_test/Android.mk
index 93a0d0288b..79c8571f61 100644
--- a/tests/carservice_unit_test/Android.mk
+++ b/tests/carservice_unit_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CarServiceUnitTest
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_CERTIFICATE := platform
 
diff --git a/tests/obd2_app/Android.mk b/tests/obd2_app/Android.mk
index 7e1e22fa39..094a6b8d7b 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)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := Obd2App
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 
diff --git a/tests/obd2_test/Android.mk b/tests/obd2_test/Android.mk
index 198a69ac08..06ffe31e5c 100644
--- a/tests/obd2_test/Android.mk
+++ b/tests/obd2_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := com.android.car.obd2.test
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_CERTIFICATE := platform
 
diff --git a/tests/usb/AoapHostApp/Android.mk b/tests/usb/AoapHostApp/Android.mk
index 66f91b6748..9fc286ade1 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)
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := AoapHostApp
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
diff --git a/tests/vehiclehal_test/Android.mk b/tests/vehiclehal_test/Android.mk
index 190cdbec7e..d5adc65f37 100644
--- a/tests/vehiclehal_test/Android.mk
+++ b/tests/vehiclehal_test/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := VehicleHALTest
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_CERTIFICATE := platform