Stop all these merge conflicts.

Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
This commit is contained in:
Steven Moreland 2016-10-25 15:45:19 -07:00 committed by Martijn Coenen
parent 188ebec994
commit 69727778a7
50 changed files with 510 additions and 64 deletions

View file

@ -1,55 +1,3 @@
// This is an autogenerated file, do not edit.
subdirs = [
"audio/2.0",
"audio/2.0/default",
"audio/common/2.0",
"audio/effect/2.0",
"benchmarks/msgq/1.0",
"biometrics/fingerprint/2.1",
"bluetooth/1.0",
"boot/1.0",
"broadcastradio/1.0",
"example/extension/light/2.0",
"gnss/1.0",
"graphics/allocator/2.0",
"graphics/allocator/2.0/default",
"graphics/composer/2.1",
"graphics/composer/2.1/default",
"graphics/mapper/2.0",
"graphics/mapper/2.0/default",
"light/2.0",
"memtrack/1.0",
"memtrack/1.0/default",
"nfc/1.0",
"nfc/1.0/default",
"nfc/1.0/vts/functional",
"power/1.0",
"power/1.0/default",
"radio/1.0",
"sensors/1.0",
"sensors/1.0/default",
"soundtrigger/2.0",
"tests/bar/1.0",
"tests/bar/1.0/default",
"tests/baz/1.0",
"tests/expression/1.0",
"tests/foo/1.0",
"tests/foo/1.0/default",
"tests/foo/1.0/default/lib",
"tests/libhwbinder/1.0",
"tests/libhwbinder/1.0/default",
"tests/msgq/1.0",
"tests/pointer/1.0",
"tests/pointer/1.0/default",
"tests/pointer/1.0/default/lib",
"thermal/1.0",
"thermal/1.0/default",
"tv/input/1.0",
"vehicle/2.0",
"vibrator/1.0",
"vibrator/1.0/default",
"vr/1.0",
"vr/1.0/default",
"wifi/1.0",
"wifi/supplicant/1.0",
"*"
]

View file

@ -93,4 +93,9 @@ cc_library_shared {
"android.hardware.audio.common@2.0",
"android.hardware.audio.effect@2.0",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

44
audio/2.0/Android.mk Normal file
View file

@ -0,0 +1,44 @@
# This file is autogenerated by hidl-gen. Do not edit manually.
LOCAL_PATH := $(call my-dir)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.audio@2.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
GEN := $(intermediates)/android/hardware/audio/2.0/Constants.java
$(GEN): $(HIDL)
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): $(LOCAL_PATH)/IDevice.hal
$(GEN): $(LOCAL_PATH)/IDevicesFactory.hal
$(GEN): $(LOCAL_PATH)/IPrimaryDevice.hal
$(GEN): $(LOCAL_PATH)/IStream.hal
$(GEN): $(LOCAL_PATH)/IStreamIn.hal
$(GEN): $(LOCAL_PATH)/IStreamOut.hal
$(GEN): $(LOCAL_PATH)/IStreamOutCallback.hal
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava-constants -randroid.hardware:hardware/interfaces \
android.hardware.audio@2.0
$(GEN):
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

6
audio/Android.bp Normal file
View file

@ -0,0 +1,6 @@
// This is an autogenerated file, do not edit.
subdirs = [
"2.0",
"common/2.0",
"effect/2.0",
]

View file

@ -35,4 +35,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

View file

@ -0,0 +1,37 @@
# This file is autogenerated by hidl-gen. Do not edit manually.
LOCAL_PATH := $(call my-dir)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.audio.common@2.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
GEN := $(intermediates)/android/hardware/audio/common/2.0/Constants.java
$(GEN): $(HIDL)
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava-constants -randroid.hardware:hardware/interfaces \
android.hardware.audio.common@2.0
$(GEN):
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

View file

@ -148,4 +148,9 @@ cc_library_shared {
"libcutils",
"android.hardware.audio.common@2.0",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

View file

@ -0,0 +1,51 @@
# This file is autogenerated by hidl-gen. Do not edit manually.
LOCAL_PATH := $(call my-dir)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.audio.effect@2.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
GEN := $(intermediates)/android/hardware/audio/effect/2.0/Constants.java
$(GEN): $(HIDL)
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): $(LOCAL_PATH)/IAcousticEchoCancelerEffect.hal
$(GEN): $(LOCAL_PATH)/IAutomaticGainControlEffect.hal
$(GEN): $(LOCAL_PATH)/IBassBoostEffect.hal
$(GEN): $(LOCAL_PATH)/IDownmixEffect.hal
$(GEN): $(LOCAL_PATH)/IEffect.hal
$(GEN): $(LOCAL_PATH)/IEffectBufferProviderCallback.hal
$(GEN): $(LOCAL_PATH)/IEffectsFactory.hal
$(GEN): $(LOCAL_PATH)/IEnvironmentalReverbEffect.hal
$(GEN): $(LOCAL_PATH)/IEqualizerEffect.hal
$(GEN): $(LOCAL_PATH)/ILoudnessEnhancerEffect.hal
$(GEN): $(LOCAL_PATH)/INoiseSuppressionEffect.hal
$(GEN): $(LOCAL_PATH)/IPresetReverbEffect.hal
$(GEN): $(LOCAL_PATH)/IVirtualizerEffect.hal
$(GEN): $(LOCAL_PATH)/IVisualizerEffect.hal
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava-constants -randroid.hardware:hardware/interfaces \
android.hardware.audio.effect@2.0
$(GEN):
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

4
benchmarks/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"msgq/1.0",
]

4
biometrics/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"fingerprint/2.1",
]

View file

@ -51,4 +51,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

4
bluetooth/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
]

4
boot/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
]

View file

@ -67,4 +67,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
]

4
example/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"extension/light/2.0",
]

View file

@ -44,4 +44,9 @@ cc_library_shared {
"libcutils",
"android.hardware.light@2.0",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

View file

@ -171,4 +171,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

4
gnss/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
]

9
graphics/Android.bp Normal file
View file

@ -0,0 +1,9 @@
// This is an autogenerated file, do not edit.
subdirs = [
"allocator/2.0",
"allocator/2.0/default",
"composer/2.1",
"composer/2.1/default",
"mapper/2.0",
"mapper/2.0/default",
]

View file

@ -43,4 +43,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

View file

@ -0,0 +1,38 @@
# This file is autogenerated by hidl-gen. Do not edit manually.
LOCAL_PATH := $(call my-dir)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.graphics.allocator@2.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
GEN := $(intermediates)/android/hardware/graphics/allocator/2.0/Constants.java
$(GEN): $(HIDL)
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): $(LOCAL_PATH)/IAllocator.hal
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava-constants -randroid.hardware:hardware/interfaces \
android.hardware.graphics.allocator@2.0
$(GEN):
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

View file

@ -52,4 +52,9 @@ cc_library_shared {
"libcutils",
"android.hardware.graphics.allocator@2.0",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

View file

@ -43,4 +43,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

4
light/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"2.0",
]

View file

@ -43,4 +43,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

5
memtrack/Android.bp Normal file
View file

@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"1.0/default",
]

6
nfc/Android.bp Normal file
View file

@ -0,0 +1,6 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"1.0/default",
"1.0/vts/functional",
]

View file

@ -43,4 +43,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

5
power/Android.bp Normal file
View file

@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"1.0/default",
]

4
radio/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
]

View file

@ -43,4 +43,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

38
sensors/1.0/Android.mk Normal file
View file

@ -0,0 +1,38 @@
# This file is autogenerated by hidl-gen. Do not edit manually.
LOCAL_PATH := $(call my-dir)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.sensors@1.0-java-constants
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
GEN := $(intermediates)/android/hardware/sensors/1.0/Constants.java
$(GEN): $(HIDL)
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): $(LOCAL_PATH)/ISensors.hal
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava-constants -randroid.hardware:hardware/interfaces \
android.hardware.sensors@1.0
$(GEN):
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-oj
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

5
sensors/Android.bp Normal file
View file

@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"1.0/default",
]

View file

@ -52,4 +52,9 @@ cc_library_shared {
"libcutils",
"android.hardware.audio.common@2.0",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

4
soundtrigger/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"2.0",
]

16
tests/Android.bp Normal file
View file

@ -0,0 +1,16 @@
// This is an autogenerated file, do not edit.
subdirs = [
"bar/1.0",
"bar/1.0/default",
"baz/1.0",
"expression/1.0",
"foo/1.0",
"foo/1.0/default",
"foo/1.0/default/lib",
"libhwbinder/1.0",
"libhwbinder/1.0/default",
"msgq/1.0",
"pointer/1.0",
"pointer/1.0/default",
"pointer/1.0/default/lib",
]

View file

@ -43,4 +43,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

5
thermal/Android.bp Normal file
View file

@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"1.0/default",
]

4
tv/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"input/1.0",
]

View file

@ -52,4 +52,9 @@ cc_library_shared {
"libcutils",
"android.hardware.audio.common@2.0",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

View file

@ -18,17 +18,28 @@ for p in $packages; do
hidl-gen -Landroidbp -r android.hardware:hardware/interfaces $p;
done
bp="hardware/interfaces/Android.bp"
androidbps=$(find hardware/interfaces/*/ \
-name "Android.bp" \
-exec dirname {} \; \
| sort)
# subdirectories of hardware/interfaces which contain an Android.bp file
android_dirs=$(find hardware/interfaces/*/ \
-name "Android.bp" \
-printf "%h\n" \
| cut -d "/" -f1-3 \
| sort | uniq)
echo "Updating $bp"
echo "Updating Android.bp files."
echo "// This is an autogenerated file, do not edit." > $bp;
echo "subdirs = [" >> $bp;
for a in $androidbps; do
echo " \"${a#*hardware/interfaces/}\"," >> $bp;
for bp_dir in $android_dirs; do
bp="$bp_dir/Android.bp"
# locations of Android.bp files in specific subdirectory of hardware/interfaces
android_bps=$(find $bp_dir \
-name "Android.bp" \
! -path $bp_dir/Android.bp \
-printf "%h\n" \
| sort)
echo "// This is an autogenerated file, do not edit." > "$bp";
echo "subdirs = [" >> "$bp";
for a in $android_bps; do
echo " \"${a#$bp_dir/}\"," >> "$bp";
done
echo "]" >> "$bp";
done
echo "]" >> $bp;

View file

@ -51,4 +51,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

4
vehicle/Android.bp Normal file
View file

@ -0,0 +1,4 @@
// This is an autogenerated file, do not edit.
subdirs = [
"2.0",
]

View file

@ -43,4 +43,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

5
vibrator/Android.bp Normal file
View file

@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"1.0/default",
]

View file

@ -39,4 +39,9 @@ cc_library_shared {
"libutils",
"libcutils",
],
export_shared_lib_headers: [
"libhidl",
"libhwbinder",
"libutils",
],
}

64
vr/1.0/Android.mk Normal file
View file

@ -0,0 +1,64 @@
# This file is autogenerated by hidl-gen. Do not edit manually.
LOCAL_PATH := $(call my-dir)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.vr@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
# Build IVr.hal
#
GEN := $(intermediates)/android/hardware/vr/1.0/IVr.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVr.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.vr@1.0::IVr
$(GEN): $(LOCAL_PATH)/IVr.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_JAVA_LIBRARY)
################################################################################
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.vr@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
# Build IVr.hal
#
GEN := $(intermediates)/android/hardware/vr/1.0/IVr.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVr.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-Ljava -randroid.hardware:hardware/interfaces \
android.hardware.vr@1.0::IVr
$(GEN): $(LOCAL_PATH)/IVr.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
include $(BUILD_STATIC_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))

5
vr/Android.bp Normal file
View file

@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"1.0/default",
]

5
wifi/Android.bp Normal file
View file

@ -0,0 +1,5 @@
// This is an autogenerated file, do not edit.
subdirs = [
"1.0",
"supplicant/1.0",
]