Use GNSS HAL v2.0 in cuttlefish
Bug: 112260995
Bug: 120277977
Test: atest VtsHalGnssV2_0TargetTest
Change-Id: I9a9d4fb412d291468e01fc918e669651e81f6e31
diff --git a/shared/config/CleanSpec.mk b/shared/config/CleanSpec.mk
new file mode 100644
index 0000000..aa2a605
--- /dev/null
+++ b/shared/config/CleanSpec.mk
@@ -0,0 +1,46 @@
+# Copyright 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+
+# Remove gps.vsoc.so and android.hardware.gnss@1.0-impl.so
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/gps.vsoc.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/android.hardware.gnss@1.0-impl.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.gnss@1.0-service)
\ No newline at end of file
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index b235b80..d382caf 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -94,15 +94,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.gnss</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IGnss</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
<version>2.0</version>
diff --git a/shared/device.mk b/shared/device.mk
index effa1ee..e1cfd9b 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -239,9 +239,7 @@
# GPS
#
PRODUCT_PACKAGES += \
- gps.vsoc \
- android.hardware.gnss@1.0-impl \
- android.hardware.gnss@1.0-service
+ android.hardware.gnss@2.0-service
# Health
PRODUCT_PACKAGES += \
