DO NOT MERGE: Remove VehicleGear reference am: b37b7a11fb

Change-Id: Ibc845b78030b549f40adbb8531200559bd87618e
diff --git a/library/main/tests/robotests/Android.bp b/library/main/tests/robotests/Android.bp
new file mode 100644
index 0000000..13335f3
--- /dev/null
+++ b/library/main/tests/robotests/Android.bp
@@ -0,0 +1,33 @@
+//##############################################################
+// CarSetupWizardLib app just for Robolectric test target.     #
+//##############################################################
+android_app {
+    name: "CarSetupWizardLib",
+
+    resource_dirs: ["res"],
+
+    platform_apis: true,
+
+    privileged: true,
+
+    libs: ["android.car"],
+
+    static_libs: ["car-setup-wizard-lib"],
+}
+
+//##############################################################
+// CarSetupWizardLib Robolectric test target.                  #
+//##############################################################
+android_robolectric_test {
+    name: "CarSetupWizardLibRoboTests",
+
+    srcs: ["src/**/*.java"],
+
+    java_resource_dirs: ["config"],
+
+    libs: [
+        "android.car",
+    ],
+
+    instrumentation_for: "CarSetupWizardLib",
+}
diff --git a/library/main/tests/robotests/Android.mk b/library/main/tests/robotests/Android.mk
deleted file mode 100644
index 1d62740..0000000
--- a/library/main/tests/robotests/Android.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-###############################################################
-# CarSetupWizardLib app just for Robolectric test target.     #
-###############################################################
-include $(CLEAR_VARS)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := CarSetupWizardLib
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_JAVA_LIBRARIES := android.car
-
-LOCAL_STATIC_ANDROID_LIBRARIES += car-setup-wizard-lib
-
-include $(BUILD_PACKAGE)
-
-###############################################################
-# CarSetupWizardLib Robolectric test target.                  #
-###############################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := CarSetupWizardLibRoboTests
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_JAVA_RESOURCE_DIRS := config
-
-LOCAL_JAVA_LIBRARIES := \
-    android.car \
-    robolectric_android-all-stub \
-    Robolectric_all-target \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt
-
-LOCAL_INSTRUMENTATION_FOR := CarSetupWizardLib
-
-LOCAL_MODULE_TAGS := optional
-
-# Generate test_config.properties
-include external/robolectric-shadows/gen_test_config.mk
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-###############################################################
-# CarSetupWizardLib runner target to run the previous target. #
-###############################################################
-include $(CLEAR_VARS)
-LOCAL_MODULE := RunCarSetupWizardLibRoboTests
-
-LOCAL_JAVA_LIBRARIES := \
-    android.car \
-    CarSetupWizardLibRoboTests \
-    robolectric_android-all-stub \
-    Robolectric_all-target \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt
-
-LOCAL_TEST_PACKAGE := CarSetupWizardLib
-
-LOCAL_ROBOTEST_FILES := $(filter-out %/BaseRobolectricTest.java,\
-    $(call find-files-in-subdirs,$(LOCAL_PATH)/src,*Test.java,.))
-
-LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
-
-include external/robolectric-shadows/run_robotests.mk
diff --git a/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl b/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl
index 1940ccb..305195b 100644
--- a/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl
+++ b/library/utils/src/com/android/car/setupwizardlib/IInitialLockSetupService.aidl
@@ -16,7 +16,7 @@
 
 package com.android.car.setupwizardlib;
 
-import src.com.android.car.setupwizardlib.LockConfig;
+import com.android.car.setupwizardlib.LockConfig;
 
 interface IInitialLockSetupService {