Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

device-generic-goldfish: Commit

device/generic/goldfish


Commit MetaInfo

Revision2ab37f8a729d64a0e7fe6571bd9fead2a663cdb3 (tree)
Time2017-03-03 03:03:30
AuthorBo Hu <bohu@goog...>
CommiterGerrit Code Review

Log Message

Merge "DO NOT MERGE ANYWHERE goldfish: adjust to the refactoring of qemu-pipe"

Change Summary

Incremental Difference

--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -36,6 +36,7 @@ emulator_camera_shared_libraries := \
3636
3737 emulator_camera_c_includes := external/jpeg \
3838 frameworks/native/include/media/hardware \
39+ system/core/qemu_pipe/include \
3940 $(LOCAL_PATH)/../../goldfish-opengl/system/OpenglSystemCommon \
4041 $(call include-path-for, camera)
4142
@@ -70,6 +71,10 @@ LOCAL_MODULE_RELATIVE_PATH := ${emulator_camera_module_relative_path}
7071 LOCAL_CFLAGS := ${emulator_camera_cflags}
7172 LOCAL_CLANG_CFLAGS += ${emulator_camera_clang_flags}
7273
74+LOCAL_STATIC_LIBRARIES := \
75+ libqemu_pipe \
76+ libbase
77+
7378 LOCAL_SHARED_LIBRARIES := ${emulator_camera_shared_libraries}
7479 LOCAL_C_INCLUDES += ${emulator_camera_c_includes}
7580 LOCAL_SRC_FILES := ${emulator_camera_src}
@@ -91,6 +96,10 @@ include ${CLEAR_VARS}
9196 LOCAL_MODULE_RELATIVE_PATH := ${emulator_camera_module_relative_path}
9297 LOCAL_CFLAGS := ${emulator_camera_cflags}
9398 LOCAL_CLANG_CFLAGS += ${emulator_camera_clang_flags}
99+LOCAL_STATIC_LIBRARIES := \
100+ libqemu_pipe \
101+ libbase
102+
94103
95104 LOCAL_SHARED_LIBRARIES := ${emulator_camera_shared_libraries}
96105 LOCAL_C_INCLUDES += ${emulator_camera_c_includes}
--- a/camera/QemuClient.cpp
+++ b/camera/QemuClient.cpp
@@ -34,7 +34,7 @@
3434 #endif // LOG_QUERIES
3535
3636 #define QEMU_PIPE_DEBUG LOGQ
37-#include <system/qemu_pipe.h>
37+#include <qemu_pipe.h>
3838
3939 namespace android {
4040
--- a/fingerprint/Android.mk
+++ b/fingerprint/Android.mk
@@ -20,6 +20,8 @@ LOCAL_MODULE := fingerprint.goldfish
2020 LOCAL_MODULE_RELATIVE_PATH := hw
2121 LOCAL_SRC_FILES := fingerprint.c
2222 LOCAL_SHARED_LIBRARIES := liblog
23+LOCAL_C_INCLUDES := system/core/qemu_pipe
24+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
2325
2426 include $(BUILD_SHARED_LIBRARY)
2527
@@ -27,7 +29,9 @@ include $(CLEAR_VARS)
2729
2830 LOCAL_MODULE := fingerprint.ranchu
2931 LOCAL_MODULE_RELATIVE_PATH := hw
32+LOCAL_C_INCLUDES := system/core/qemu_pipe
3033 LOCAL_SRC_FILES := fingerprint.c
3134 LOCAL_SHARED_LIBRARIES := liblog
35+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
3236
3337 include $(BUILD_SHARED_LIBRARY)
--- a/fingerprint/fingerprint.c
+++ b/fingerprint/fingerprint.c
@@ -30,7 +30,7 @@
3030 #include <cutils/log.h>
3131 #include <hardware/hardware.h>
3232 #include <hardware/fingerprint.h>
33-#include <system/qemu_pipe.h>
33+#include <qemu_pipe.h>
3434
3535 #include <errno.h>
3636 #include <endian.h>
--- a/gps/Android.mk
+++ b/gps/Android.mk
@@ -25,6 +25,9 @@ LOCAL_PATH := $(call my-dir)
2525 include $(CLEAR_VARS)
2626
2727 LOCAL_MODULE_RELATIVE_PATH := hw
28+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
29+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
30+
2831 LOCAL_CFLAGS += -DQEMU_HARDWARE
2932 LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware
3033 LOCAL_SRC_FILES := gps_qemu.c
@@ -39,6 +42,9 @@ include $(BUILD_SHARED_LIBRARY)
3942 include $(CLEAR_VARS)
4043
4144 LOCAL_MODULE_RELATIVE_PATH := hw
45+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
46+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
47+
4248 LOCAL_CFLAGS += -DQEMU_HARDWARE
4349 LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware
4450 LOCAL_SRC_FILES := gps_qemu.c
--- a/gps/gps_qemu.c
+++ b/gps/gps_qemu.c
@@ -34,7 +34,7 @@
3434 #include <cutils/log.h>
3535 #include <cutils/sockets.h>
3636 #include <hardware/gps.h>
37-#include <system/qemu_pipe.h>
37+#include <qemu_pipe.h>
3838
3939 /* the name of the qemu-controlled pipe */
4040 #define QEMU_CHANNEL_NAME "pipe:qemud:gps"
--- a/lights/Android.mk
+++ b/lights/Android.mk
@@ -18,6 +18,9 @@ LOCAL_PATH := $(call my-dir)
1818 # hw/<LIGHTS_HARDWARE_MODULE_ID>.<ro.hardware>.so
1919 include $(CLEAR_VARS)
2020 LOCAL_MODULE_RELATIVE_PATH := hw
21+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
22+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
23+
2124 LOCAL_SHARED_LIBRARIES := liblog libcutils
2225 LOCAL_SRC_FILES := lights_qemu.c
2326 LOCAL_MODULE := lights.goldfish
--- a/lights/lights_qemu.c
+++ b/lights/lights_qemu.c
@@ -42,7 +42,7 @@
4242 #include <cutils/log.h>
4343
4444 #define DEBUG_QEMU_PIPE D
45-#include <system/qemu_pipe.h>
45+#include <qemu_pipe.h>
4646
4747 #include <hardware/lights.h>
4848 #include <errno.h>
--- a/power/Android.mk
+++ b/power/Android.mk
@@ -23,6 +23,8 @@ LOCAL_MODULE_RELATIVE_PATH := hw
2323 LOCAL_CFLAGS += -DQEMU_HARDWARE
2424 LOCAL_SHARED_LIBRARIES := liblog libcutils
2525 LOCAL_SRC_FILES := power_qemu.c
26+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
27+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
2628 LOCAL_MODULE := power.goldfish
2729 LOCAL_MODULE_TAGS := optional
2830 include $(BUILD_SHARED_LIBRARY)
--- a/power/power_qemu.c
+++ b/power/power_qemu.c
@@ -19,7 +19,7 @@
1919
2020 #include <hardware/hardware.h>
2121 #include <hardware/power.h>
22-#include <system/qemu_pipe.h>
22+#include <qemu_pipe.h>
2323 #include <fcntl.h>
2424 #include <errno.h>
2525
--- a/qemu-props/Android.mk
+++ b/qemu-props/Android.mk
@@ -24,5 +24,8 @@ LOCAL_PATH := $(call my-dir)
2424 include $(CLEAR_VARS)
2525 LOCAL_MODULE := qemu-props
2626 LOCAL_SRC_FILES := qemu-props.c
27+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
28+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
29+
2730 LOCAL_SHARED_LIBRARIES := libcutils liblog
2831 include $(BUILD_EXECUTABLE)
--- a/qemu-props/qemu-props.c
+++ b/qemu-props/qemu-props.c
@@ -34,7 +34,7 @@
3434 #endif
3535
3636 #include <cutils/properties.h>
37-#include <system/qemu_pipe.h>
37+#include <qemu_pipe.h>
3838 #include <unistd.h>
3939
4040 /* Name of the qemud service we want to connect to.
--- a/sensors/Android.mk
+++ b/sensors/Android.mk
@@ -22,6 +22,9 @@ include $(CLEAR_VARS)
2222 LOCAL_MODULE_RELATIVE_PATH := hw
2323 LOCAL_SHARED_LIBRARIES := liblog libcutils
2424 LOCAL_SRC_FILES := sensors_qemu.c
25+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
26+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
27+
2528 ifeq ($(TARGET_PRODUCT),vbox_x86)
2629 LOCAL_MODULE := sensors.vbox_x86
2730 else
@@ -34,6 +37,9 @@ include $(CLEAR_VARS)
3437
3538 LOCAL_MODULE_RELATIVE_PATH := hw
3639 LOCAL_SHARED_LIBRARIES := liblog libcutils
40+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
41+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
42+
3743 LOCAL_SRC_FILES := sensors_qemu.c
3844 LOCAL_MODULE := sensors.ranchu
3945
--- a/sensors/sensors_qemu.c
+++ b/sensors/sensors_qemu.c
@@ -45,7 +45,7 @@
4545
4646 #define E(...) ALOGE(__VA_ARGS__)
4747
48-#include <system/qemu_pipe.h>
48+#include <qemu_pipe.h>
4949
5050 /** SENSOR IDS AND NAMES
5151 **/
--- a/vibrator/Android.mk
+++ b/vibrator/Android.mk
@@ -21,6 +21,9 @@ LOCAL_MODULE := vibrator.goldfish
2121 # HAL module implemenation stored in
2222 # hw/<VIBRATOR_HARDWARE_MODULE_ID>.goldfish.so
2323 LOCAL_MODULE_RELATIVE_PATH := hw
24+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
25+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
26+
2427 LOCAL_SRC_FILES := vibrator_qemu.c
2528 LOCAL_SHARED_LIBRARIES := liblog libhardware
2629 LOCAL_MODULE_TAGS := optional
--- a/vibrator/vibrator_qemu.c
+++ b/vibrator/vibrator_qemu.c
@@ -22,7 +22,7 @@
2222 #define QEMU_HARDWARE
2323 #include <hardware/hardware.h>
2424 #include <hardware/vibrator.h>
25-#include <system/qemu_pipe.h>
25+#include <qemu_pipe.h>
2626
2727 static int sendit(unsigned int timeout_ms)
2828 {
Show on old repository browser