Merge "gps: update gps version 4.11.0_127" into udc-d1-dev
This commit is contained in:
commit
1f417c78db
19 changed files with 1 additions and 409 deletions
|
@ -74,206 +74,3 @@ cc_prebuilt_binary {
|
|||
// Bypass because libsitril-gps is Android.mk module
|
||||
check_elf_files: false,
|
||||
}
|
||||
|
||||
// factory daemon and libraries
|
||||
cc_prebuilt_binary {
|
||||
name: "sctd",
|
||||
arch: {
|
||||
arm64: {
|
||||
srcs: ["release/sctd"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libhardware_legacy",
|
||||
"libcutils",
|
||||
"libssl",
|
||||
"libcrypto",
|
||||
// "libsitril-gps",
|
||||
"android.frameworks.sensorservice@1.0",
|
||||
"libhidlbase",
|
||||
"libandroid_net",
|
||||
"libc++",
|
||||
"libc",
|
||||
"libm",
|
||||
"libdl",
|
||||
],
|
||||
},
|
||||
},
|
||||
compile_multilib: "64",
|
||||
vendor: true,
|
||||
relative_install_path: "hw",
|
||||
strip: {
|
||||
none: true,
|
||||
},
|
||||
// Bypass because libsitril-gps is Android.mk module
|
||||
check_elf_files: false,
|
||||
}
|
||||
|
||||
cc_prebuilt_binary {
|
||||
name: "spad",
|
||||
arch: {
|
||||
arm64: {
|
||||
srcs: ["release/spad"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libhardware_legacy",
|
||||
"libcutils",
|
||||
"libssl",
|
||||
"libcrypto",
|
||||
// "libsitril-gps",
|
||||
"android.frameworks.sensorservice@1.0",
|
||||
"libhidlbase",
|
||||
"libandroid_net",
|
||||
"libc++",
|
||||
"libc",
|
||||
"libm",
|
||||
"libdl",
|
||||
],
|
||||
},
|
||||
},
|
||||
compile_multilib: "64",
|
||||
vendor: true,
|
||||
relative_install_path: "hw",
|
||||
strip: {
|
||||
none: true,
|
||||
},
|
||||
// Bypass because libsitril-gps is Android.mk module
|
||||
check_elf_files: false,
|
||||
}
|
||||
|
||||
cc_prebuilt_binary {
|
||||
name: "swcnd",
|
||||
arch: {
|
||||
arm64: {
|
||||
srcs: ["release/swcnd"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libutils",
|
||||
"libhardware_legacy",
|
||||
"libcutils",
|
||||
"libssl",
|
||||
"libcrypto",
|
||||
// "libsitril-gps",
|
||||
"android.frameworks.sensorservice@1.0",
|
||||
"libhidlbase",
|
||||
"libandroid_net",
|
||||
"libc++",
|
||||
"libc",
|
||||
"libm",
|
||||
"libdl",
|
||||
],
|
||||
},
|
||||
},
|
||||
compile_multilib: "64",
|
||||
vendor: true,
|
||||
relative_install_path: "hw",
|
||||
strip: {
|
||||
none: true,
|
||||
},
|
||||
// Bypass because libsitril-gps is Android.mk module
|
||||
check_elf_files: false,
|
||||
}
|
||||
|
||||
|
||||
cc_prebuilt_library_shared {
|
||||
name: "libmptool_utils",
|
||||
arch: {
|
||||
arm64: {
|
||||
srcs: ["release/libmptool_utils.so"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libhidlbase",
|
||||
"libutils",
|
||||
"android.hardware.gnss@1.0",
|
||||
"android.hardware.gnss@1.1",
|
||||
"android.hardware.gnss@2.0",
|
||||
"android.hardware.gnss@2.1",
|
||||
"android.hardware.gnss.measurement_corrections@1.0",
|
||||
"android.hardware.gnss.visibility_control@1.0",
|
||||
"libhardware",
|
||||
"libc++",
|
||||
"libc",
|
||||
"libm",
|
||||
"libdl",
|
||||
],
|
||||
},
|
||||
},
|
||||
compile_multilib: "64",
|
||||
vendor: true,
|
||||
// relative_install_path: "hw",
|
||||
strip: {
|
||||
none: true,
|
||||
},
|
||||
// Bypass because libhidltransport is deprecated
|
||||
check_elf_files: false,
|
||||
//vintf_fragments: ["android.hardware.gnss@2.1-service-lass.xml"]
|
||||
}
|
||||
|
||||
cc_prebuilt_library_shared {
|
||||
name: "libmptool_log",
|
||||
arch: {
|
||||
arm64: {
|
||||
srcs: ["release/libmptool_log.so"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libhidlbase",
|
||||
"libutils",
|
||||
"android.hardware.gnss@1.0",
|
||||
"android.hardware.gnss@1.1",
|
||||
"android.hardware.gnss@2.0",
|
||||
"android.hardware.gnss@2.1",
|
||||
"android.hardware.gnss.measurement_corrections@1.0",
|
||||
"android.hardware.gnss.visibility_control@1.0",
|
||||
"libhardware",
|
||||
"libc++",
|
||||
"libc",
|
||||
"libm",
|
||||
"libdl",
|
||||
],
|
||||
},
|
||||
},
|
||||
compile_multilib: "64",
|
||||
vendor: true,
|
||||
// relative_install_path: "hw",
|
||||
strip: {
|
||||
none: true,
|
||||
},
|
||||
// Bypass because libhidltransport is deprecated
|
||||
check_elf_files: false,
|
||||
//vintf_fragments: ["android.hardware.gnss@2.1-service-lass.xml"]
|
||||
}
|
||||
|
||||
cc_prebuilt_library_shared {
|
||||
name: "libmptool_json",
|
||||
arch: {
|
||||
arm64: {
|
||||
srcs: ["release/libmptool_json.so"],
|
||||
shared_libs: [
|
||||
"liblog",
|
||||
"libhidlbase",
|
||||
"libutils",
|
||||
"android.hardware.gnss@1.0",
|
||||
"android.hardware.gnss@1.1",
|
||||
"android.hardware.gnss@2.0",
|
||||
"android.hardware.gnss@2.1",
|
||||
"android.hardware.gnss.measurement_corrections@1.0",
|
||||
"android.hardware.gnss.visibility_control@1.0",
|
||||
"libhardware",
|
||||
"libc++",
|
||||
"libc",
|
||||
"libm",
|
||||
"libdl",
|
||||
],
|
||||
},
|
||||
},
|
||||
compile_multilib: "64",
|
||||
vendor: true,
|
||||
// relative_install_path: "hw",
|
||||
strip: {
|
||||
none: true,
|
||||
},
|
||||
// Bypass because libhidltransport is deprecated
|
||||
check_elf_files: false,
|
||||
//vintf_fragments: ["android.hardware.gnss@2.1-service-lass.xml"]
|
||||
}
|
||||
|
|
|
@ -2,17 +2,7 @@
|
|||
GPS_ROOT := device/google/akita/location/gnssd
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.gnss@2.1-impl \
|
||||
vendor.samsung.hardware.gnss@1.0 \
|
||||
vendor.samsung.hardware.gnss@1.0-impl \
|
||||
vendor.samsung.hardware.gnss@1.0-service \
|
||||
gnssd \
|
||||
sctd \
|
||||
spad \
|
||||
swcnd \
|
||||
libmptool_json \
|
||||
libmptool_log \
|
||||
libmptool_utils \
|
||||
gnss-aidl-service_IGnssV2_ISlsiGnssV1 \
|
||||
libsensorndkbridge
|
||||
|
||||
|
@ -29,9 +19,6 @@ DEVICE_MANIFEST_FILE += \
|
|||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(GPS_ROOT)/release/ca.pem:vendor/etc/gnss/ca.pem \
|
||||
$(GPS_ROOT)/release/sctd.json:vendor/etc/sctd.json \
|
||||
$(GPS_ROOT)/release/spad.json:vendor/etc/spad.json \
|
||||
$(GPS_ROOT)/release/swcnd.json:vendor/etc/swcnd.json \
|
||||
$(GPS_ROOT)/release/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
|
||||
|
||||
#DEVICE_MATRIX_FILE := \
|
||||
|
|
|
@ -107,25 +107,3 @@ on property:persist.vendor.gps=1
|
|||
start gnssd
|
||||
start slsi_gnss_service
|
||||
|
||||
|
||||
# factory daemon
|
||||
service sctd /vendor/bin/hw/sctd --json "/vendor/etc/sctd.json"
|
||||
class factory
|
||||
user root
|
||||
group root system bluetooth radio misc
|
||||
disabled
|
||||
#seclabel u:r:shell:s0
|
||||
|
||||
service swcnd /vendor/bin/hw/swcnd --json "/vendor/etc/swcnd.json"
|
||||
class factory
|
||||
user root
|
||||
group system bluetooth radio misc
|
||||
disabled
|
||||
#seclabel u:r:shell:s0
|
||||
|
||||
service spad /vendor/bin/hw/spad --json "/vendor/etc/spad.json"
|
||||
class factory
|
||||
user root
|
||||
group system bluetooth radio misc
|
||||
disabled
|
||||
#seclabel u:r:shell:s0
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -66,7 +66,7 @@ gnss_rfic_chip_id=55200001
|
|||
# Uncomment to Disable SUPL (Ignore Android Framework Requests to Enable SUPL)
|
||||
#GlueLayer_EnableFwConfiguration=0
|
||||
|
||||
# Uncomment to disable SGEE
|
||||
#Comment out to disable SGEE
|
||||
#Sif_OperationMode=0
|
||||
|
||||
# set to 1 for FW SGEE download
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,87 +0,0 @@
|
|||
{
|
||||
"console" : {
|
||||
"uart" : {
|
||||
"support" : false,
|
||||
"active" : true,
|
||||
"route" : "/dev/ttySAC0"
|
||||
},
|
||||
"usb" : {
|
||||
"support" : true,
|
||||
"active" : {"persist.vendor.config.ttygs0" : 1},
|
||||
"route" : "/dev/ttyGS0",
|
||||
"timeout" : 0
|
||||
},
|
||||
"tcp" : {
|
||||
"support" : false,
|
||||
"active" : false,
|
||||
"route" : "127.0.0.1",
|
||||
"port" : 7727
|
||||
},
|
||||
"local" : {
|
||||
"support" : true,
|
||||
"active" : true,
|
||||
"route" : "/dev/socket/sctd",
|
||||
"timeout" : 20
|
||||
}
|
||||
},
|
||||
"receive-mode" : {
|
||||
"mode" : "tail",
|
||||
"tail" : "0d0a",
|
||||
"millisecond" : "100"
|
||||
},
|
||||
"module" : {
|
||||
"support-modules" : [
|
||||
"sctd",
|
||||
"pcba",
|
||||
"wcn"
|
||||
],
|
||||
"test-commands" : {
|
||||
"pcba" : [
|
||||
"SAT"
|
||||
]
|
||||
},
|
||||
"interaction" : {
|
||||
"pcba" : {
|
||||
"timeout" : 15,
|
||||
"keep-alive" : false,
|
||||
"path" : "/dev/socket/sync_spad"
|
||||
},
|
||||
"wcn" : {
|
||||
"timeout" : 20,
|
||||
"keep-alive" : true,
|
||||
"path" : "/dev/socket/sync_wcn"
|
||||
}
|
||||
},
|
||||
"whitelist" : {
|
||||
"sctd" : [
|
||||
"SAT+TCP",
|
||||
"SAT+USB",
|
||||
"SAT+UART",
|
||||
"SAT+IP",
|
||||
"SAT+PORT",
|
||||
"SAT+UPDATE"
|
||||
],
|
||||
"pcba" : [
|
||||
"SAT+TIMEOUT",
|
||||
"SAT+REBOOT",
|
||||
"SAT+WIFI",
|
||||
"SAT+BT"
|
||||
],
|
||||
"wcn" : [
|
||||
"RF+AP2WB",
|
||||
"RF+WB2AP",
|
||||
"AT+WIFIRF",
|
||||
"ATA+WIFI",
|
||||
"AT+BTRF",
|
||||
"ATA+BT",
|
||||
"AT+GPSFTTEST",
|
||||
"ATA+GPS",
|
||||
"SAT+WCNTCP",
|
||||
"SAT+WCNTCPIP",
|
||||
"SAT+WCNTCPPORT",
|
||||
"SAT+WCNSETTIME"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
|
||||
service sctd /vendor/bin/sctd --json "/vendor/etc/sctd.json"
|
||||
class factory
|
||||
user root
|
||||
group root system bluetooth radio misc
|
||||
#seclabel u:r:shell:s0
|
Binary file not shown.
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
"misc" : {
|
||||
"libpath" : "/vendor/lib64/libmphal_default.so",
|
||||
"default_timeout" : 15,
|
||||
"support" : true
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
service SPA-daemon /vendor/bin/spad
|
||||
class factory
|
||||
group system root radio cache inet misc audio log
|
||||
user root
|
||||
seclabel u:r:su:s0
|
Binary file not shown.
|
@ -1,51 +0,0 @@
|
|||
{
|
||||
"console" : {
|
||||
"tcp" : {
|
||||
"support" : true,
|
||||
"active" : false,
|
||||
"ip" : "",
|
||||
"port" : "2543"
|
||||
},
|
||||
"local" : {
|
||||
"support" : true,
|
||||
"active" : true,
|
||||
"ip" : "/dev/socket/sync_wcn"
|
||||
}
|
||||
},
|
||||
"module" : {
|
||||
"interaction" : {
|
||||
"wlan&bt" : {
|
||||
"libpath" : "/vendor/lib64/libwlbt.so",
|
||||
"support" : true,
|
||||
"timeout" : 15
|
||||
},
|
||||
"gnss" : {
|
||||
"libpath" : "/vendor/lib64/hw/android.hardware.gnss@2.1-impl.so",
|
||||
"timeout" : 15,
|
||||
"support" : true
|
||||
}
|
||||
},
|
||||
|
||||
"whitelist" : {
|
||||
"wlan&bt" : [
|
||||
"RF+AP2WB",
|
||||
"RF+WB2AP",
|
||||
"AT+BTRF",
|
||||
"ATA+BT",
|
||||
"AT+WIFIRF",
|
||||
"ATA+WIFI"
|
||||
],
|
||||
"gnss" : [
|
||||
"AT+GPSFTTEST",
|
||||
"ATA+GPS"
|
||||
],
|
||||
"internal" : [
|
||||
"SAT+WCNTCP",
|
||||
"SAT+WCNTCPIP",
|
||||
"SAT+WCNTCPPORT",
|
||||
"SAT+WCNSETTIME"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
on post-fs-data && property:ro.bootmode=sfactory
|
||||
setprop sys.boot_completed 1
|
||||
|
||||
service swcnd /vendor/bin/swcnd --json "/vendor/etc/swcnd.json"
|
||||
class factory
|
||||
user root
|
||||
group system bluetooth radio misc
|
||||
#seclabel u:r:shell:s0
|
|
@ -1,5 +0,0 @@
|
|||
service slsi_gnss_service /vendor/bin/hw/gnss-aidl-service_IGnssV2_ISlsiGnssV1
|
||||
class main
|
||||
user system
|
||||
group system gps
|
||||
disabled
|
Loading…
Add table
Add a link
Reference in a new issue