From d783cabd4d9bddb4b83f2dd38300b7598bb58b24 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 14 Jan 2019 17:40:45 -0800 Subject: [PATCH 1/3] Split up headers. This splits headers into three locations: include - for backwards compatibility, the global include include_all - for things system/vendor both use include_vendor - for things that only vendors use The goal is to gradually have system things stop referencing (at least most) of these headers. Bug: 37280010 Test: build (CL on top adds back in symlinks) Change-Id: Ibf194276b7faa857e1e7605d7719f4e7d873ecba --- Android.bp | 20 ++++++++++++++++++- .../hardware/activity_recognition.h | 0 {include => include_all}/hardware/audio.h | 0 .../hardware/audio_alsaops.h | 0 .../hardware/audio_effect.h | 0 .../hardware/audio_policy.h | 0 {include => include_all}/hardware/bluetooth.h | 0 .../hardware/boot_control.h | 0 {include => include_all}/hardware/camera.h | 0 {include => include_all}/hardware/camera2.h | 0 {include => include_all}/hardware/camera3.h | 0 .../hardware/camera_common.h | 0 .../hardware/consumerir.h | 0 .../hardware/context_hub.h | 0 {include => include_all}/hardware/fb.h | 0 .../hardware/fingerprint.h | 0 .../hardware/fused_location.h | 0 .../hardware/gatekeeper.h | 0 {include => include_all}/hardware/gnss-base.h | 0 {include => include_all}/hardware/gps.h | 0 .../hardware/gps_internal.h | 0 {include => include_all}/hardware/gralloc.h | 0 {include => include_all}/hardware/gralloc1.h | 0 {include => include_all}/hardware/hardware.h | 0 {include => include_all}/hardware/hdmi_cec.h | 0 .../hardware/hw_auth_token.h | 0 .../hardware/hwcomposer.h | 0 .../hardware/hwcomposer2.h | 0 .../hardware/hwcomposer_defs.h | 0 {include => include_all}/hardware/input.h | 0 .../hardware/keymaster1.h | 0 .../hardware/keymaster2.h | 0 .../hardware/keymaster_common.h | 0 .../hardware/keymaster_defs.h | 0 {include => include_all}/hardware/lights.h | 0 .../hardware/local_time_hal.h | 0 {include => include_all}/hardware/memtrack.h | 0 {include => include_all}/hardware/nfc-base.h | 0 {include => include_all}/hardware/nfc.h | 0 {include => include_all}/hardware/nfc_tag.h | 0 {include => include_all}/hardware/nvram.h | 0 .../hardware/nvram_defs.h | 0 {include => include_all}/hardware/power.h | 0 {include => include_all}/hardware/radio.h | 0 .../hardware/sensors-base.h | 0 {include => include_all}/hardware/sensors.h | 0 .../hardware/sound_trigger.h | 0 {include => include_all}/hardware/thermal.h | 0 {include => include_all}/hardware/tv_input.h | 0 {include => include_all}/hardware/vibrator.h | 0 {include => include_all}/hardware/vr.h | 0 update-includes.sh | 19 ++++++++++++++++++ 52 files changed, 38 insertions(+), 1 deletion(-) rename {include => include_all}/hardware/activity_recognition.h (100%) rename {include => include_all}/hardware/audio.h (100%) rename {include => include_all}/hardware/audio_alsaops.h (100%) rename {include => include_all}/hardware/audio_effect.h (100%) rename {include => include_all}/hardware/audio_policy.h (100%) rename {include => include_all}/hardware/bluetooth.h (100%) rename {include => include_all}/hardware/boot_control.h (100%) rename {include => include_all}/hardware/camera.h (100%) rename {include => include_all}/hardware/camera2.h (100%) rename {include => include_all}/hardware/camera3.h (100%) rename {include => include_all}/hardware/camera_common.h (100%) rename {include => include_all}/hardware/consumerir.h (100%) rename {include => include_all}/hardware/context_hub.h (100%) rename {include => include_all}/hardware/fb.h (100%) rename {include => include_all}/hardware/fingerprint.h (100%) rename {include => include_all}/hardware/fused_location.h (100%) rename {include => include_all}/hardware/gatekeeper.h (100%) rename {include => include_all}/hardware/gnss-base.h (100%) rename {include => include_all}/hardware/gps.h (100%) rename {include => include_all}/hardware/gps_internal.h (100%) rename {include => include_all}/hardware/gralloc.h (100%) rename {include => include_all}/hardware/gralloc1.h (100%) rename {include => include_all}/hardware/hardware.h (100%) rename {include => include_all}/hardware/hdmi_cec.h (100%) rename {include => include_all}/hardware/hw_auth_token.h (100%) rename {include => include_all}/hardware/hwcomposer.h (100%) rename {include => include_all}/hardware/hwcomposer2.h (100%) rename {include => include_all}/hardware/hwcomposer_defs.h (100%) rename {include => include_all}/hardware/input.h (100%) rename {include => include_all}/hardware/keymaster1.h (100%) rename {include => include_all}/hardware/keymaster2.h (100%) rename {include => include_all}/hardware/keymaster_common.h (100%) rename {include => include_all}/hardware/keymaster_defs.h (100%) rename {include => include_all}/hardware/lights.h (100%) rename {include => include_all}/hardware/local_time_hal.h (100%) rename {include => include_all}/hardware/memtrack.h (100%) rename {include => include_all}/hardware/nfc-base.h (100%) rename {include => include_all}/hardware/nfc.h (100%) rename {include => include_all}/hardware/nfc_tag.h (100%) rename {include => include_all}/hardware/nvram.h (100%) rename {include => include_all}/hardware/nvram_defs.h (100%) rename {include => include_all}/hardware/power.h (100%) rename {include => include_all}/hardware/radio.h (100%) rename {include => include_all}/hardware/sensors-base.h (100%) rename {include => include_all}/hardware/sensors.h (100%) rename {include => include_all}/hardware/sound_trigger.h (100%) rename {include => include_all}/hardware/thermal.h (100%) rename {include => include_all}/hardware/tv_input.h (100%) rename {include => include_all}/hardware/vibrator.h (100%) rename {include => include_all}/hardware/vr.h (100%) create mode 100755 update-includes.sh diff --git a/Android.bp b/Android.bp index 6baab685..70d76fa2 100644 --- a/Android.bp +++ b/Android.bp @@ -32,6 +32,7 @@ license { cc_library_headers { name: "libhardware_headers", + header_libs: [ "libaudio_system_headers", "libsystem_headers", @@ -45,11 +46,22 @@ cc_library_headers { "libbluetooth-types-header", ], - export_include_dirs: ["include"], recovery_available: true, vendor_available: true, // TODO(b/153609531): remove when no longer needed. native_bridge_supported: true, + + // There are three include directories currently: + // - include: this directory is the original location of libhardware headers. It is globally + // available (even if you do not depend on libhardware). Many locations also use + // LOCAL_C_INCLUDES or include_dirs to access these from a global namespace. These processes + // should replace this dependency with a direct dependency on libhardware(_headers)?. + // - include_all: this directory is for system and vendor include files. Gradually, the number of + // files here should be reduced to 0 by moving them to vendor as old code is phased out. + // - include_vendor: this directory is the current designated resting place for these headers. + // They are kept around to try to help insure existing codebases can function. + export_include_dirs: ["include_all"], + target: { recovery: { exclude_header_libs: [ @@ -60,6 +72,12 @@ cc_library_headers { windows: { enabled: true, }, + vendor: { + override_export_include_dirs: [ + "include_all", + "include_vendor", + ], + }, }, apex_available: [ "//apex_available:platform", diff --git a/include/hardware/activity_recognition.h b/include_all/hardware/activity_recognition.h similarity index 100% rename from include/hardware/activity_recognition.h rename to include_all/hardware/activity_recognition.h diff --git a/include/hardware/audio.h b/include_all/hardware/audio.h similarity index 100% rename from include/hardware/audio.h rename to include_all/hardware/audio.h diff --git a/include/hardware/audio_alsaops.h b/include_all/hardware/audio_alsaops.h similarity index 100% rename from include/hardware/audio_alsaops.h rename to include_all/hardware/audio_alsaops.h diff --git a/include/hardware/audio_effect.h b/include_all/hardware/audio_effect.h similarity index 100% rename from include/hardware/audio_effect.h rename to include_all/hardware/audio_effect.h diff --git a/include/hardware/audio_policy.h b/include_all/hardware/audio_policy.h similarity index 100% rename from include/hardware/audio_policy.h rename to include_all/hardware/audio_policy.h diff --git a/include/hardware/bluetooth.h b/include_all/hardware/bluetooth.h similarity index 100% rename from include/hardware/bluetooth.h rename to include_all/hardware/bluetooth.h diff --git a/include/hardware/boot_control.h b/include_all/hardware/boot_control.h similarity index 100% rename from include/hardware/boot_control.h rename to include_all/hardware/boot_control.h diff --git a/include/hardware/camera.h b/include_all/hardware/camera.h similarity index 100% rename from include/hardware/camera.h rename to include_all/hardware/camera.h diff --git a/include/hardware/camera2.h b/include_all/hardware/camera2.h similarity index 100% rename from include/hardware/camera2.h rename to include_all/hardware/camera2.h diff --git a/include/hardware/camera3.h b/include_all/hardware/camera3.h similarity index 100% rename from include/hardware/camera3.h rename to include_all/hardware/camera3.h diff --git a/include/hardware/camera_common.h b/include_all/hardware/camera_common.h similarity index 100% rename from include/hardware/camera_common.h rename to include_all/hardware/camera_common.h diff --git a/include/hardware/consumerir.h b/include_all/hardware/consumerir.h similarity index 100% rename from include/hardware/consumerir.h rename to include_all/hardware/consumerir.h diff --git a/include/hardware/context_hub.h b/include_all/hardware/context_hub.h similarity index 100% rename from include/hardware/context_hub.h rename to include_all/hardware/context_hub.h diff --git a/include/hardware/fb.h b/include_all/hardware/fb.h similarity index 100% rename from include/hardware/fb.h rename to include_all/hardware/fb.h diff --git a/include/hardware/fingerprint.h b/include_all/hardware/fingerprint.h similarity index 100% rename from include/hardware/fingerprint.h rename to include_all/hardware/fingerprint.h diff --git a/include/hardware/fused_location.h b/include_all/hardware/fused_location.h similarity index 100% rename from include/hardware/fused_location.h rename to include_all/hardware/fused_location.h diff --git a/include/hardware/gatekeeper.h b/include_all/hardware/gatekeeper.h similarity index 100% rename from include/hardware/gatekeeper.h rename to include_all/hardware/gatekeeper.h diff --git a/include/hardware/gnss-base.h b/include_all/hardware/gnss-base.h similarity index 100% rename from include/hardware/gnss-base.h rename to include_all/hardware/gnss-base.h diff --git a/include/hardware/gps.h b/include_all/hardware/gps.h similarity index 100% rename from include/hardware/gps.h rename to include_all/hardware/gps.h diff --git a/include/hardware/gps_internal.h b/include_all/hardware/gps_internal.h similarity index 100% rename from include/hardware/gps_internal.h rename to include_all/hardware/gps_internal.h diff --git a/include/hardware/gralloc.h b/include_all/hardware/gralloc.h similarity index 100% rename from include/hardware/gralloc.h rename to include_all/hardware/gralloc.h diff --git a/include/hardware/gralloc1.h b/include_all/hardware/gralloc1.h similarity index 100% rename from include/hardware/gralloc1.h rename to include_all/hardware/gralloc1.h diff --git a/include/hardware/hardware.h b/include_all/hardware/hardware.h similarity index 100% rename from include/hardware/hardware.h rename to include_all/hardware/hardware.h diff --git a/include/hardware/hdmi_cec.h b/include_all/hardware/hdmi_cec.h similarity index 100% rename from include/hardware/hdmi_cec.h rename to include_all/hardware/hdmi_cec.h diff --git a/include/hardware/hw_auth_token.h b/include_all/hardware/hw_auth_token.h similarity index 100% rename from include/hardware/hw_auth_token.h rename to include_all/hardware/hw_auth_token.h diff --git a/include/hardware/hwcomposer.h b/include_all/hardware/hwcomposer.h similarity index 100% rename from include/hardware/hwcomposer.h rename to include_all/hardware/hwcomposer.h diff --git a/include/hardware/hwcomposer2.h b/include_all/hardware/hwcomposer2.h similarity index 100% rename from include/hardware/hwcomposer2.h rename to include_all/hardware/hwcomposer2.h diff --git a/include/hardware/hwcomposer_defs.h b/include_all/hardware/hwcomposer_defs.h similarity index 100% rename from include/hardware/hwcomposer_defs.h rename to include_all/hardware/hwcomposer_defs.h diff --git a/include/hardware/input.h b/include_all/hardware/input.h similarity index 100% rename from include/hardware/input.h rename to include_all/hardware/input.h diff --git a/include/hardware/keymaster1.h b/include_all/hardware/keymaster1.h similarity index 100% rename from include/hardware/keymaster1.h rename to include_all/hardware/keymaster1.h diff --git a/include/hardware/keymaster2.h b/include_all/hardware/keymaster2.h similarity index 100% rename from include/hardware/keymaster2.h rename to include_all/hardware/keymaster2.h diff --git a/include/hardware/keymaster_common.h b/include_all/hardware/keymaster_common.h similarity index 100% rename from include/hardware/keymaster_common.h rename to include_all/hardware/keymaster_common.h diff --git a/include/hardware/keymaster_defs.h b/include_all/hardware/keymaster_defs.h similarity index 100% rename from include/hardware/keymaster_defs.h rename to include_all/hardware/keymaster_defs.h diff --git a/include/hardware/lights.h b/include_all/hardware/lights.h similarity index 100% rename from include/hardware/lights.h rename to include_all/hardware/lights.h diff --git a/include/hardware/local_time_hal.h b/include_all/hardware/local_time_hal.h similarity index 100% rename from include/hardware/local_time_hal.h rename to include_all/hardware/local_time_hal.h diff --git a/include/hardware/memtrack.h b/include_all/hardware/memtrack.h similarity index 100% rename from include/hardware/memtrack.h rename to include_all/hardware/memtrack.h diff --git a/include/hardware/nfc-base.h b/include_all/hardware/nfc-base.h similarity index 100% rename from include/hardware/nfc-base.h rename to include_all/hardware/nfc-base.h diff --git a/include/hardware/nfc.h b/include_all/hardware/nfc.h similarity index 100% rename from include/hardware/nfc.h rename to include_all/hardware/nfc.h diff --git a/include/hardware/nfc_tag.h b/include_all/hardware/nfc_tag.h similarity index 100% rename from include/hardware/nfc_tag.h rename to include_all/hardware/nfc_tag.h diff --git a/include/hardware/nvram.h b/include_all/hardware/nvram.h similarity index 100% rename from include/hardware/nvram.h rename to include_all/hardware/nvram.h diff --git a/include/hardware/nvram_defs.h b/include_all/hardware/nvram_defs.h similarity index 100% rename from include/hardware/nvram_defs.h rename to include_all/hardware/nvram_defs.h diff --git a/include/hardware/power.h b/include_all/hardware/power.h similarity index 100% rename from include/hardware/power.h rename to include_all/hardware/power.h diff --git a/include/hardware/radio.h b/include_all/hardware/radio.h similarity index 100% rename from include/hardware/radio.h rename to include_all/hardware/radio.h diff --git a/include/hardware/sensors-base.h b/include_all/hardware/sensors-base.h similarity index 100% rename from include/hardware/sensors-base.h rename to include_all/hardware/sensors-base.h diff --git a/include/hardware/sensors.h b/include_all/hardware/sensors.h similarity index 100% rename from include/hardware/sensors.h rename to include_all/hardware/sensors.h diff --git a/include/hardware/sound_trigger.h b/include_all/hardware/sound_trigger.h similarity index 100% rename from include/hardware/sound_trigger.h rename to include_all/hardware/sound_trigger.h diff --git a/include/hardware/thermal.h b/include_all/hardware/thermal.h similarity index 100% rename from include/hardware/thermal.h rename to include_all/hardware/thermal.h diff --git a/include/hardware/tv_input.h b/include_all/hardware/tv_input.h similarity index 100% rename from include/hardware/tv_input.h rename to include_all/hardware/tv_input.h diff --git a/include/hardware/vibrator.h b/include_all/hardware/vibrator.h similarity index 100% rename from include/hardware/vibrator.h rename to include_all/hardware/vibrator.h diff --git a/include/hardware/vr.h b/include_all/hardware/vr.h similarity index 100% rename from include/hardware/vr.h rename to include_all/hardware/vr.h diff --git a/update-includes.sh b/update-includes.sh new file mode 100755 index 00000000..92aafc9c --- /dev/null +++ b/update-includes.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set +ex + +if [ ! "$ANDROID_BUILD_TOP" ]; then + echo "lunch?" + exit 1 +fi + +function update-includes() { + find -L "$ANDROID_BUILD_TOP/hardware/libhardware/include/hardware" -maxdepth 1 -xtype l -exec rm {} \; + + for f in $ANDROID_BUILD_TOP/hardware/libhardware/include_all/hardware/*; do + local bn="$(basename $f)" + ln -s "../../include_all/hardware/$bn" "$ANDROID_BUILD_TOP/hardware/libhardware/include/hardware/$bn" + done +} + +update-includes From 3556da3b4ac73bb42f837f900436ce2bcdae01a6 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 14 Jan 2019 17:43:02 -0800 Subject: [PATCH 2/3] Add include/hardware/*.h symlinks. These are required to build. Separate CL to preserve blame history. From running 'update-includes.sh' script here. Bug: 37280010 Test: boot/build (sanity) Change-Id: Id9c2dc37f674b27b947a9f823bd38a550d64d31b --- include/hardware/activity_recognition.h | 1 + include/hardware/audio.h | 1 + include/hardware/audio_alsaops.h | 1 + include/hardware/audio_effect.h | 1 + include/hardware/audio_policy.h | 1 + include/hardware/bluetooth.h | 1 + include/hardware/boot_control.h | 1 + include/hardware/camera.h | 1 + include/hardware/camera2.h | 1 + include/hardware/camera3.h | 1 + include/hardware/camera_common.h | 1 + include/hardware/consumerir.h | 1 + include/hardware/context_hub.h | 1 + include/hardware/fb.h | 1 + include/hardware/fingerprint.h | 1 + include/hardware/fused_location.h | 1 + include/hardware/gatekeeper.h | 1 + include/hardware/gnss-base.h | 1 + include/hardware/gps.h | 1 + include/hardware/gps_internal.h | 1 + include/hardware/gralloc.h | 1 + include/hardware/gralloc1.h | 1 + include/hardware/hardware.h | 1 + include/hardware/hdmi_cec.h | 1 + include/hardware/hw_auth_token.h | 1 + include/hardware/hwcomposer.h | 1 + include/hardware/hwcomposer2.h | 1 + include/hardware/hwcomposer_defs.h | 1 + include/hardware/input.h | 1 + include/hardware/keymaster1.h | 1 + include/hardware/keymaster2.h | 1 + include/hardware/keymaster_common.h | 1 + include/hardware/keymaster_defs.h | 1 + include/hardware/lights.h | 1 + include/hardware/local_time_hal.h | 1 + include/hardware/memtrack.h | 1 + include/hardware/nfc-base.h | 1 + include/hardware/nfc.h | 1 + include/hardware/nfc_tag.h | 1 + include/hardware/nvram.h | 1 + include/hardware/nvram_defs.h | 1 + include/hardware/power.h | 1 + include/hardware/radio.h | 1 + include/hardware/sensors-base.h | 1 + include/hardware/sensors.h | 1 + include/hardware/sound_trigger.h | 1 + include/hardware/thermal.h | 1 + include/hardware/tv_input.h | 1 + include/hardware/vibrator.h | 1 + include/hardware/vr.h | 1 + 50 files changed, 50 insertions(+) create mode 120000 include/hardware/activity_recognition.h create mode 120000 include/hardware/audio.h create mode 120000 include/hardware/audio_alsaops.h create mode 120000 include/hardware/audio_effect.h create mode 120000 include/hardware/audio_policy.h create mode 120000 include/hardware/bluetooth.h create mode 120000 include/hardware/boot_control.h create mode 120000 include/hardware/camera.h create mode 120000 include/hardware/camera2.h create mode 120000 include/hardware/camera3.h create mode 120000 include/hardware/camera_common.h create mode 120000 include/hardware/consumerir.h create mode 120000 include/hardware/context_hub.h create mode 120000 include/hardware/fb.h create mode 120000 include/hardware/fingerprint.h create mode 120000 include/hardware/fused_location.h create mode 120000 include/hardware/gatekeeper.h create mode 120000 include/hardware/gnss-base.h create mode 120000 include/hardware/gps.h create mode 120000 include/hardware/gps_internal.h create mode 120000 include/hardware/gralloc.h create mode 120000 include/hardware/gralloc1.h create mode 120000 include/hardware/hardware.h create mode 120000 include/hardware/hdmi_cec.h create mode 120000 include/hardware/hw_auth_token.h create mode 120000 include/hardware/hwcomposer.h create mode 120000 include/hardware/hwcomposer2.h create mode 120000 include/hardware/hwcomposer_defs.h create mode 120000 include/hardware/input.h create mode 120000 include/hardware/keymaster1.h create mode 120000 include/hardware/keymaster2.h create mode 120000 include/hardware/keymaster_common.h create mode 120000 include/hardware/keymaster_defs.h create mode 120000 include/hardware/lights.h create mode 120000 include/hardware/local_time_hal.h create mode 120000 include/hardware/memtrack.h create mode 120000 include/hardware/nfc-base.h create mode 120000 include/hardware/nfc.h create mode 120000 include/hardware/nfc_tag.h create mode 120000 include/hardware/nvram.h create mode 120000 include/hardware/nvram_defs.h create mode 120000 include/hardware/power.h create mode 120000 include/hardware/radio.h create mode 120000 include/hardware/sensors-base.h create mode 120000 include/hardware/sensors.h create mode 120000 include/hardware/sound_trigger.h create mode 120000 include/hardware/thermal.h create mode 120000 include/hardware/tv_input.h create mode 120000 include/hardware/vibrator.h create mode 120000 include/hardware/vr.h diff --git a/include/hardware/activity_recognition.h b/include/hardware/activity_recognition.h new file mode 120000 index 00000000..b1d4fbe8 --- /dev/null +++ b/include/hardware/activity_recognition.h @@ -0,0 +1 @@ +../../include_all/hardware/activity_recognition.h \ No newline at end of file diff --git a/include/hardware/audio.h b/include/hardware/audio.h new file mode 120000 index 00000000..7e25631f --- /dev/null +++ b/include/hardware/audio.h @@ -0,0 +1 @@ +../../include_all/hardware/audio.h \ No newline at end of file diff --git a/include/hardware/audio_alsaops.h b/include/hardware/audio_alsaops.h new file mode 120000 index 00000000..a3087d28 --- /dev/null +++ b/include/hardware/audio_alsaops.h @@ -0,0 +1 @@ +../../include_all/hardware/audio_alsaops.h \ No newline at end of file diff --git a/include/hardware/audio_effect.h b/include/hardware/audio_effect.h new file mode 120000 index 00000000..e557a2df --- /dev/null +++ b/include/hardware/audio_effect.h @@ -0,0 +1 @@ +../../include_all/hardware/audio_effect.h \ No newline at end of file diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h new file mode 120000 index 00000000..d9dca236 --- /dev/null +++ b/include/hardware/audio_policy.h @@ -0,0 +1 @@ +../../include_all/hardware/audio_policy.h \ No newline at end of file diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h new file mode 120000 index 00000000..bcd8225e --- /dev/null +++ b/include/hardware/bluetooth.h @@ -0,0 +1 @@ +../../include_all/hardware/bluetooth.h \ No newline at end of file diff --git a/include/hardware/boot_control.h b/include/hardware/boot_control.h new file mode 120000 index 00000000..a514282b --- /dev/null +++ b/include/hardware/boot_control.h @@ -0,0 +1 @@ +../../include_all/hardware/boot_control.h \ No newline at end of file diff --git a/include/hardware/camera.h b/include/hardware/camera.h new file mode 120000 index 00000000..2f56bc81 --- /dev/null +++ b/include/hardware/camera.h @@ -0,0 +1 @@ +../../include_all/hardware/camera.h \ No newline at end of file diff --git a/include/hardware/camera2.h b/include/hardware/camera2.h new file mode 120000 index 00000000..6edb861d --- /dev/null +++ b/include/hardware/camera2.h @@ -0,0 +1 @@ +../../include_all/hardware/camera2.h \ No newline at end of file diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h new file mode 120000 index 00000000..10676a9d --- /dev/null +++ b/include/hardware/camera3.h @@ -0,0 +1 @@ +../../include_all/hardware/camera3.h \ No newline at end of file diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h new file mode 120000 index 00000000..359395a1 --- /dev/null +++ b/include/hardware/camera_common.h @@ -0,0 +1 @@ +../../include_all/hardware/camera_common.h \ No newline at end of file diff --git a/include/hardware/consumerir.h b/include/hardware/consumerir.h new file mode 120000 index 00000000..bde1d550 --- /dev/null +++ b/include/hardware/consumerir.h @@ -0,0 +1 @@ +../../include_all/hardware/consumerir.h \ No newline at end of file diff --git a/include/hardware/context_hub.h b/include/hardware/context_hub.h new file mode 120000 index 00000000..3f06d0a8 --- /dev/null +++ b/include/hardware/context_hub.h @@ -0,0 +1 @@ +../../include_all/hardware/context_hub.h \ No newline at end of file diff --git a/include/hardware/fb.h b/include/hardware/fb.h new file mode 120000 index 00000000..4606b504 --- /dev/null +++ b/include/hardware/fb.h @@ -0,0 +1 @@ +../../include_all/hardware/fb.h \ No newline at end of file diff --git a/include/hardware/fingerprint.h b/include/hardware/fingerprint.h new file mode 120000 index 00000000..65108894 --- /dev/null +++ b/include/hardware/fingerprint.h @@ -0,0 +1 @@ +../../include_all/hardware/fingerprint.h \ No newline at end of file diff --git a/include/hardware/fused_location.h b/include/hardware/fused_location.h new file mode 120000 index 00000000..e06e29dc --- /dev/null +++ b/include/hardware/fused_location.h @@ -0,0 +1 @@ +../../include_all/hardware/fused_location.h \ No newline at end of file diff --git a/include/hardware/gatekeeper.h b/include/hardware/gatekeeper.h new file mode 120000 index 00000000..e186e3ce --- /dev/null +++ b/include/hardware/gatekeeper.h @@ -0,0 +1 @@ +../../include_all/hardware/gatekeeper.h \ No newline at end of file diff --git a/include/hardware/gnss-base.h b/include/hardware/gnss-base.h new file mode 120000 index 00000000..c17eed76 --- /dev/null +++ b/include/hardware/gnss-base.h @@ -0,0 +1 @@ +../../include_all/hardware/gnss-base.h \ No newline at end of file diff --git a/include/hardware/gps.h b/include/hardware/gps.h new file mode 120000 index 00000000..19b8cd35 --- /dev/null +++ b/include/hardware/gps.h @@ -0,0 +1 @@ +../../include_all/hardware/gps.h \ No newline at end of file diff --git a/include/hardware/gps_internal.h b/include/hardware/gps_internal.h new file mode 120000 index 00000000..7ae93d61 --- /dev/null +++ b/include/hardware/gps_internal.h @@ -0,0 +1 @@ +../../include_all/hardware/gps_internal.h \ No newline at end of file diff --git a/include/hardware/gralloc.h b/include/hardware/gralloc.h new file mode 120000 index 00000000..7842f87d --- /dev/null +++ b/include/hardware/gralloc.h @@ -0,0 +1 @@ +../../include_all/hardware/gralloc.h \ No newline at end of file diff --git a/include/hardware/gralloc1.h b/include/hardware/gralloc1.h new file mode 120000 index 00000000..9529fc31 --- /dev/null +++ b/include/hardware/gralloc1.h @@ -0,0 +1 @@ +../../include_all/hardware/gralloc1.h \ No newline at end of file diff --git a/include/hardware/hardware.h b/include/hardware/hardware.h new file mode 120000 index 00000000..dd9251a5 --- /dev/null +++ b/include/hardware/hardware.h @@ -0,0 +1 @@ +../../include_all/hardware/hardware.h \ No newline at end of file diff --git a/include/hardware/hdmi_cec.h b/include/hardware/hdmi_cec.h new file mode 120000 index 00000000..9b40a10e --- /dev/null +++ b/include/hardware/hdmi_cec.h @@ -0,0 +1 @@ +../../include_all/hardware/hdmi_cec.h \ No newline at end of file diff --git a/include/hardware/hw_auth_token.h b/include/hardware/hw_auth_token.h new file mode 120000 index 00000000..dba2b12e --- /dev/null +++ b/include/hardware/hw_auth_token.h @@ -0,0 +1 @@ +../../include_all/hardware/hw_auth_token.h \ No newline at end of file diff --git a/include/hardware/hwcomposer.h b/include/hardware/hwcomposer.h new file mode 120000 index 00000000..48b8766e --- /dev/null +++ b/include/hardware/hwcomposer.h @@ -0,0 +1 @@ +../../include_all/hardware/hwcomposer.h \ No newline at end of file diff --git a/include/hardware/hwcomposer2.h b/include/hardware/hwcomposer2.h new file mode 120000 index 00000000..f1b1b80f --- /dev/null +++ b/include/hardware/hwcomposer2.h @@ -0,0 +1 @@ +../../include_all/hardware/hwcomposer2.h \ No newline at end of file diff --git a/include/hardware/hwcomposer_defs.h b/include/hardware/hwcomposer_defs.h new file mode 120000 index 00000000..b742cce8 --- /dev/null +++ b/include/hardware/hwcomposer_defs.h @@ -0,0 +1 @@ +../../include_all/hardware/hwcomposer_defs.h \ No newline at end of file diff --git a/include/hardware/input.h b/include/hardware/input.h new file mode 120000 index 00000000..82154a2e --- /dev/null +++ b/include/hardware/input.h @@ -0,0 +1 @@ +../../include_all/hardware/input.h \ No newline at end of file diff --git a/include/hardware/keymaster1.h b/include/hardware/keymaster1.h new file mode 120000 index 00000000..89c95266 --- /dev/null +++ b/include/hardware/keymaster1.h @@ -0,0 +1 @@ +../../include_all/hardware/keymaster1.h \ No newline at end of file diff --git a/include/hardware/keymaster2.h b/include/hardware/keymaster2.h new file mode 120000 index 00000000..1f23c5e6 --- /dev/null +++ b/include/hardware/keymaster2.h @@ -0,0 +1 @@ +../../include_all/hardware/keymaster2.h \ No newline at end of file diff --git a/include/hardware/keymaster_common.h b/include/hardware/keymaster_common.h new file mode 120000 index 00000000..b2033fb8 --- /dev/null +++ b/include/hardware/keymaster_common.h @@ -0,0 +1 @@ +../../include_all/hardware/keymaster_common.h \ No newline at end of file diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h new file mode 120000 index 00000000..18abd60a --- /dev/null +++ b/include/hardware/keymaster_defs.h @@ -0,0 +1 @@ +../../include_all/hardware/keymaster_defs.h \ No newline at end of file diff --git a/include/hardware/lights.h b/include/hardware/lights.h new file mode 120000 index 00000000..3c758836 --- /dev/null +++ b/include/hardware/lights.h @@ -0,0 +1 @@ +../../include_all/hardware/lights.h \ No newline at end of file diff --git a/include/hardware/local_time_hal.h b/include/hardware/local_time_hal.h new file mode 120000 index 00000000..27f43153 --- /dev/null +++ b/include/hardware/local_time_hal.h @@ -0,0 +1 @@ +../../include_all/hardware/local_time_hal.h \ No newline at end of file diff --git a/include/hardware/memtrack.h b/include/hardware/memtrack.h new file mode 120000 index 00000000..3bc44484 --- /dev/null +++ b/include/hardware/memtrack.h @@ -0,0 +1 @@ +../../include_all/hardware/memtrack.h \ No newline at end of file diff --git a/include/hardware/nfc-base.h b/include/hardware/nfc-base.h new file mode 120000 index 00000000..adb2d5df --- /dev/null +++ b/include/hardware/nfc-base.h @@ -0,0 +1 @@ +../../include_all/hardware/nfc-base.h \ No newline at end of file diff --git a/include/hardware/nfc.h b/include/hardware/nfc.h new file mode 120000 index 00000000..920dfd8b --- /dev/null +++ b/include/hardware/nfc.h @@ -0,0 +1 @@ +../../include_all/hardware/nfc.h \ No newline at end of file diff --git a/include/hardware/nfc_tag.h b/include/hardware/nfc_tag.h new file mode 120000 index 00000000..34925574 --- /dev/null +++ b/include/hardware/nfc_tag.h @@ -0,0 +1 @@ +../../include_all/hardware/nfc_tag.h \ No newline at end of file diff --git a/include/hardware/nvram.h b/include/hardware/nvram.h new file mode 120000 index 00000000..75be0853 --- /dev/null +++ b/include/hardware/nvram.h @@ -0,0 +1 @@ +../../include_all/hardware/nvram.h \ No newline at end of file diff --git a/include/hardware/nvram_defs.h b/include/hardware/nvram_defs.h new file mode 120000 index 00000000..2dca93b7 --- /dev/null +++ b/include/hardware/nvram_defs.h @@ -0,0 +1 @@ +../../include_all/hardware/nvram_defs.h \ No newline at end of file diff --git a/include/hardware/power.h b/include/hardware/power.h new file mode 120000 index 00000000..d51a9229 --- /dev/null +++ b/include/hardware/power.h @@ -0,0 +1 @@ +../../include_all/hardware/power.h \ No newline at end of file diff --git a/include/hardware/radio.h b/include/hardware/radio.h new file mode 120000 index 00000000..f9ad9d71 --- /dev/null +++ b/include/hardware/radio.h @@ -0,0 +1 @@ +../../include_all/hardware/radio.h \ No newline at end of file diff --git a/include/hardware/sensors-base.h b/include/hardware/sensors-base.h new file mode 120000 index 00000000..b64751df --- /dev/null +++ b/include/hardware/sensors-base.h @@ -0,0 +1 @@ +../../include_all/hardware/sensors-base.h \ No newline at end of file diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h new file mode 120000 index 00000000..28591f82 --- /dev/null +++ b/include/hardware/sensors.h @@ -0,0 +1 @@ +../../include_all/hardware/sensors.h \ No newline at end of file diff --git a/include/hardware/sound_trigger.h b/include/hardware/sound_trigger.h new file mode 120000 index 00000000..0bd0d03d --- /dev/null +++ b/include/hardware/sound_trigger.h @@ -0,0 +1 @@ +../../include_all/hardware/sound_trigger.h \ No newline at end of file diff --git a/include/hardware/thermal.h b/include/hardware/thermal.h new file mode 120000 index 00000000..d6b52706 --- /dev/null +++ b/include/hardware/thermal.h @@ -0,0 +1 @@ +../../include_all/hardware/thermal.h \ No newline at end of file diff --git a/include/hardware/tv_input.h b/include/hardware/tv_input.h new file mode 120000 index 00000000..0c8780da --- /dev/null +++ b/include/hardware/tv_input.h @@ -0,0 +1 @@ +../../include_all/hardware/tv_input.h \ No newline at end of file diff --git a/include/hardware/vibrator.h b/include/hardware/vibrator.h new file mode 120000 index 00000000..423e53e8 --- /dev/null +++ b/include/hardware/vibrator.h @@ -0,0 +1 @@ +../../include_all/hardware/vibrator.h \ No newline at end of file diff --git a/include/hardware/vr.h b/include/hardware/vr.h new file mode 120000 index 00000000..fb209913 --- /dev/null +++ b/include/hardware/vr.h @@ -0,0 +1 @@ +../../include_all/hardware/vr.h \ No newline at end of file From 68990e5354efd4af2ea042055bc8e818f7e467c3 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 14 Jan 2019 17:45:19 -0800 Subject: [PATCH 3/3] fused_location.h: vendor-only This commit hides fused_location.h from the system. - include - it is no longer in the global include - include_all - it is no longer accessible to system things which use libhardware Bug: 37280010 Test: boot/build Change-Id: I12297f28d8d2330821f45c3a2caced026ea703ed --- include/hardware/fused_location.h | 1 - {include_all => include_vendor}/hardware/fused_location.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 include/hardware/fused_location.h rename {include_all => include_vendor}/hardware/fused_location.h (99%) diff --git a/include/hardware/fused_location.h b/include/hardware/fused_location.h deleted file mode 120000 index e06e29dc..00000000 --- a/include/hardware/fused_location.h +++ /dev/null @@ -1 +0,0 @@ -../../include_all/hardware/fused_location.h \ No newline at end of file diff --git a/include_all/hardware/fused_location.h b/include_vendor/hardware/fused_location.h similarity index 99% rename from include_all/hardware/fused_location.h rename to include_vendor/hardware/fused_location.h index 550e1933..d8cfc7b7 100644 --- a/include_all/hardware/fused_location.h +++ b/include_vendor/hardware/fused_location.h @@ -19,7 +19,7 @@ #include -#include "gnss-base.h" +#include /** * This header file defines the interface of the Fused Location Provider.