diff --git a/XServer/Android.mk b/XServer/Android.mk index 771a71b..09eb78a 100644 --- a/XServer/Android.mk +++ b/XServer/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 org.apache.http.legacy +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 org.apache.http.legacy okhttp bouncycastle LOCAL_JNI_SHARED_LIBRARIES := libapplication \ libsdl-1.2 \ diff --git a/XServer/jni/application/xserver/Android.mk b/XServer/jni/application/xserver/Android.mk index a74d73d..781c54d 100644 --- a/XServer/jni/application/xserver/Android.mk +++ b/XServer/jni/application/xserver/Android.mk @@ -7,11 +7,12 @@ include $(CLEAR_VARS) LOCAL_MODULE := libapplication LOCAL_C_INCLUDES := \ - external/XServer-XSDL-android-src/jni/application/header/include \ - external/XServer-XSDL-android-src/jni/sdl-1.2/include \ - external/XServer-XSDL-android-src/jni/sdl_ttf/include \ - $(TARGET_OUT_INTERMEDIATES)/include/pixman \ - external/XServer-XSDL-android-src/other_lib/android-shmem \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop/X11 \ + $(LOCAL_PATH)/../../sdl-1.2/include \ + $(LOCAL_PATH)/../../sdl_ttf/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop/pixman \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop/android-shmem \ external/boringssl/include \ $(LOCAL_PATH)/xserver/include \ $(LOCAL_PATH)/xserver/hw/kdrive/src \ diff --git a/XServer/other_lib/android-shmem/Android.mk b/XServer/other_lib/android-shmem/Android.mk index c3b8787..3525ec6 100644 --- a/XServer/other_lib/android-shmem/Android.mk +++ b/XServer/other_lib/android-shmem/Android.mk @@ -20,3 +20,11 @@ LOCAL_LDFLAGS := -Wl,--version-script=$(LOCAL_PATH)/exports.txt LOCAL_LDLIBS := -llog include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_COPY_HEADERS_TO := desktop/android-shmem/sys + +LOCAL_COPY_HEADERS := sys/shm.h + +include $(BUILD_COPY_HEADERS) diff --git a/XServer/other_lib/pixman-0.30.2/Android.mk b/XServer/other_lib/pixman-0.30.2/Android.mk index 0b16539..a5de9ae 100644 --- a/XServer/other_lib/pixman-0.30.2/Android.mk +++ b/XServer/other_lib/pixman-0.30.2/Android.mk @@ -54,7 +54,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := pixman +LOCAL_COPY_HEADERS_TO := desktop/pixman LOCAL_COPY_HEADERS := pixman/pixman.h \ pixman/pixman-version.h \ diff --git a/XServer/other_lib/x_header/bigreqsproto-1.1.2/Android.mk b/XServer/other_lib/x_header/bigreqsproto-1.1.2/Android.mk index 8cc76f9..1120a15 100644 --- a/XServer/other_lib/x_header/bigreqsproto-1.1.2/Android.mk +++ b/XServer/other_lib/x_header/bigreqsproto-1.1.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := bigreqsproto.h \ bigreqstr.h diff --git a/XServer/other_lib/x_header/compositeproto-0.4.2/Android.mk b/XServer/other_lib/x_header/compositeproto-0.4.2/Android.mk index 3383e1b..b43f76b 100644 --- a/XServer/other_lib/x_header/compositeproto-0.4.2/Android.mk +++ b/XServer/other_lib/x_header/compositeproto-0.4.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := composite.h \ compositeproto.h diff --git a/XServer/other_lib/x_header/damageproto-1.2.1/Android.mk b/XServer/other_lib/x_header/damageproto-1.2.1/Android.mk index 0847a25..ae7c6ee 100644 --- a/XServer/other_lib/x_header/damageproto-1.2.1/Android.mk +++ b/XServer/other_lib/x_header/damageproto-1.2.1/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := damageproto.h \ damagewire.h diff --git a/XServer/other_lib/x_header/fixesproto-5.0/Android.mk b/XServer/other_lib/x_header/fixesproto-5.0/Android.mk index 03f4f8e..a2dcda4 100644 --- a/XServer/other_lib/x_header/fixesproto-5.0/Android.mk +++ b/XServer/other_lib/x_header/fixesproto-5.0/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := xfixesproto.h \ xfixeswire.h diff --git a/XServer/other_lib/x_header/fontsproto-2.1.2/Android.mk b/XServer/other_lib/x_header/fontsproto-2.1.2/Android.mk index 08857ea..f22ee66 100644 --- a/XServer/other_lib/x_header/fontsproto-2.1.2/Android.mk +++ b/XServer/other_lib/x_header/fontsproto-2.1.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/fonts +LOCAL_COPY_HEADERS_TO := desktop/X11/fonts LOCAL_COPY_HEADERS := font.h \ fontproto.h \ fontstruct.h \ diff --git a/XServer/other_lib/x_header/inputproto-2.3/Android.mk b/XServer/other_lib/x_header/inputproto-2.3/Android.mk index 236c783..f11c0fa 100644 --- a/XServer/other_lib/x_header/inputproto-2.3/Android.mk +++ b/XServer/other_lib/x_header/inputproto-2.3/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := XI.h \ XIproto.h \ XI2.h \ diff --git a/XServer/other_lib/x_header/kbproto-1.0.6/Android.mk b/XServer/other_lib/x_header/kbproto-1.0.6/Android.mk index 192d73c..f2298d3 100644 --- a/XServer/other_lib/x_header/kbproto-1.0.6/Android.mk +++ b/XServer/other_lib/x_header/kbproto-1.0.6/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := XKBgeom.h \ XKB.h \ XKBproto.h \ diff --git a/XServer/other_lib/x_header/randrproto-1.4.0/Android.mk b/XServer/other_lib/x_header/randrproto-1.4.0/Android.mk index 2e19201..f2edcca 100644 --- a/XServer/other_lib/x_header/randrproto-1.4.0/Android.mk +++ b/XServer/other_lib/x_header/randrproto-1.4.0/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := randr.h \ randrproto.h diff --git a/XServer/other_lib/x_header/recordproto-1.14.2/Android.mk b/XServer/other_lib/x_header/recordproto-1.14.2/Android.mk index 5c22861..5cd7a09 100644 --- a/XServer/other_lib/x_header/recordproto-1.14.2/Android.mk +++ b/XServer/other_lib/x_header/recordproto-1.14.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := recordconst.h \ recordproto.h \ recordstr.h diff --git a/XServer/other_lib/x_header/renderproto-0.11.1/Android.mk b/XServer/other_lib/x_header/renderproto-0.11.1/Android.mk index 04483a7..3bdba64 100644 --- a/XServer/other_lib/x_header/renderproto-0.11.1/Android.mk +++ b/XServer/other_lib/x_header/renderproto-0.11.1/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := render.h \ renderproto.h include $(BUILD_COPY_HEADERS) diff --git a/XServer/other_lib/x_header/resourceproto-1.2.0/Android.mk b/XServer/other_lib/x_header/resourceproto-1.2.0/Android.mk index a62ba1d..85e5ffa 100644 --- a/XServer/other_lib/x_header/resourceproto-1.2.0/Android.mk +++ b/XServer/other_lib/x_header/resourceproto-1.2.0/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := XResproto.h include $(BUILD_COPY_HEADERS) diff --git a/XServer/other_lib/x_header/scrnsaverproto-1.2.2/Android.mk b/XServer/other_lib/x_header/scrnsaverproto-1.2.2/Android.mk index d9f285b..0ecda9a 100644 --- a/XServer/other_lib/x_header/scrnsaverproto-1.2.2/Android.mk +++ b/XServer/other_lib/x_header/scrnsaverproto-1.2.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := saver.h \ saverproto.h diff --git a/XServer/other_lib/x_header/videoproto-2.3.2/Android.mk b/XServer/other_lib/x_header/videoproto-2.3.2/Android.mk index 3c7be23..60d3c15 100644 --- a/XServer/other_lib/x_header/videoproto-2.3.2/Android.mk +++ b/XServer/other_lib/x_header/videoproto-2.3.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := vldXvMC.h \ Xv.h \ XvMC.h \ diff --git a/XServer/other_lib/x_header/xcmiscproto-1.2.2/Android.mk b/XServer/other_lib/x_header/xcmiscproto-1.2.2/Android.mk index 8709181..03306de 100644 --- a/XServer/other_lib/x_header/xcmiscproto-1.2.2/Android.mk +++ b/XServer/other_lib/x_header/xcmiscproto-1.2.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := xcmiscproto.h \ xcmiscstr.h diff --git a/XServer/other_lib/x_header/xextproto-7.2.1/Android.mk b/XServer/other_lib/x_header/xextproto-7.2.1/Android.mk index 7af930a..4d7f8ff 100644 --- a/XServer/other_lib/x_header/xextproto-7.2.1/Android.mk +++ b/XServer/other_lib/x_header/xextproto-7.2.1/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := dpmsconst.h \ dpmsproto.h \ ge.h \ diff --git a/XServer/other_lib/x_header/xf86bigfontproto-1.2.0/Android.mk b/XServer/other_lib/x_header/xf86bigfontproto-1.2.0/Android.mk index 2ff2a9b..952219f 100644 --- a/XServer/other_lib/x_header/xf86bigfontproto-1.2.0/Android.mk +++ b/XServer/other_lib/x_header/xf86bigfontproto-1.2.0/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := xf86bigfont.h \ xf86bigfproto.h \ xf86bigfstr.h diff --git a/XServer/other_lib/x_header/xineramaproto-1.2.1/Android.mk b/XServer/other_lib/x_header/xineramaproto-1.2.1/Android.mk index 6345ca6..87f6404 100644 --- a/XServer/other_lib/x_header/xineramaproto-1.2.1/Android.mk +++ b/XServer/other_lib/x_header/xineramaproto-1.2.1/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := panoramiXproto.h include $(BUILD_COPY_HEADERS) diff --git a/XServer/other_lib/x_header/xproto-7.0.24/Android.mk b/XServer/other_lib/x_header/xproto-7.0.24/Android.mk index 1c76863..e4d7a13 100644 --- a/XServer/other_lib/x_header/xproto-7.0.24/Android.mk +++ b/XServer/other_lib/x_header/xproto-7.0.24/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11 +LOCAL_COPY_HEADERS_TO := desktop/X11 LOCAL_COPY_HEADERS := ap_keysym.h \ DECkeysym.h \ HPkeysym.h \ diff --git a/XServer/other_lib/x_header/xtrans-1.2.7/Android.mk b/XServer/other_lib/x_header/xtrans-1.2.7/Android.mk index ee5b93d..186960d 100644 --- a/XServer/other_lib/x_header/xtrans-1.2.7/Android.mk +++ b/XServer/other_lib/x_header/xtrans-1.2.7/Android.mk @@ -7,7 +7,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/Xtrans +LOCAL_COPY_HEADERS_TO := desktop/X11/Xtrans LOCAL_COPY_HEADERS := Xtrans.h \ Xtrans.c \ diff --git a/XServer/other_lib/x_lib/libICE-1.0.8/Android.mk b/XServer/other_lib/x_lib/libICE-1.0.8/Android.mk index 1e439de..15de0a1 100644 --- a/XServer/other_lib/x_lib/libICE-1.0.8/Android.mk +++ b/XServer/other_lib/x_lib/libICE-1.0.8/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libICE LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/include/X11/ICE \ $(LOCAL_PATH)/ \ diff --git a/XServer/other_lib/x_lib/libSM-1.2.2/Android.mk b/XServer/other_lib/x_lib/libSM-1.2.2/Android.mk index 1ee6cb3..9f13f9b 100644 --- a/XServer/other_lib/x_lib/libSM-1.2.2/Android.mk +++ b/XServer/other_lib/x_lib/libSM-1.2.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libSM LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/include/X11/SM \ $(LOCAL_PATH)/ \ diff --git a/XServer/other_lib/x_lib/libX11-1.6.2/Android.mk b/XServer/other_lib/x_lib/libX11-1.6.2/Android.mk index 6cabf0c..7876ddc 100644 --- a/XServer/other_lib/x_lib/libX11-1.6.2/Android.mk +++ b/XServer/other_lib/x_lib/libX11-1.6.2/Android.mk @@ -8,7 +8,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libX11 LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/include/X11 \ @@ -305,7 +305,7 @@ $(call import-module,android/support) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11 +LOCAL_COPY_HEADERS_TO := desktop/X11 LOCAL_COPY_HEADERS := \ include/X11/XKBlib.h \ diff --git a/XServer/other_lib/x_lib/libXau-1.0.8/Android.mk b/XServer/other_lib/x_lib/libXau-1.0.8/Android.mk index 4777817..d4f1e2a 100644 --- a/XServer/other_lib/x_lib/libXau-1.0.8/Android.mk +++ b/XServer/other_lib/x_lib/libXau-1.0.8/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libXau LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ @@ -34,7 +34,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11 +LOCAL_COPY_HEADERS_TO := desktop/X11 LOCAL_COPY_HEADERS := include/X11/Xauth.h diff --git a/XServer/other_lib/x_lib/libXdmcp-1.1.1/Android.mk b/XServer/other_lib/x_lib/libXdmcp-1.1.1/Android.mk index e495c3e..f6c19f0 100644 --- a/XServer/other_lib/x_lib/libXdmcp-1.1.1/Android.mk +++ b/XServer/other_lib/x_lib/libXdmcp-1.1.1/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libXdmcp LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ @@ -35,7 +35,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11 +LOCAL_COPY_HEADERS_TO := desktop/X11 LOCAL_COPY_HEADERS := include/X11/Xdmcp.h diff --git a/XServer/other_lib/x_lib/libXext-1.3.2/Android.mk b/XServer/other_lib/x_lib/libXext-1.3.2/Android.mk index e51dff9..1fed084 100644 --- a/XServer/other_lib/x_lib/libXext-1.3.2/Android.mk +++ b/XServer/other_lib/x_lib/libXext-1.3.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libXext LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ diff --git a/XServer/other_lib/x_lib/libXfont-1.4.6/Android.mk b/XServer/other_lib/x_lib/libXfont-1.4.6/Android.mk index 221a00a..1965835 100644 --- a/XServer/other_lib/x_lib/libXfont-1.4.6/Android.mk +++ b/XServer/other_lib/x_lib/libXfont-1.4.6/Android.mk @@ -7,7 +7,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libXfont LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ external/freetype/include \ diff --git a/XServer/other_lib/x_lib/libXmu-1.1.2/Android.mk b/XServer/other_lib/x_lib/libXmu-1.1.2/Android.mk index 2c40d28..2b68094 100644 --- a/XServer/other_lib/x_lib/libXmu-1.1.2/Android.mk +++ b/XServer/other_lib/x_lib/libXmu-1.1.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libXmu LOCAL_C_INCLUDES := \ - external/XServer-XSDL-android-src/jni/application/header/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/include/X11/Xmu \ $(LOCAL_PATH)/ \ diff --git a/XServer/other_lib/x_lib/libXrandr-1.4.2/Android.mk b/XServer/other_lib/x_lib/libXrandr-1.4.2/Android.mk index dc278b6..f008d94 100644 --- a/XServer/other_lib/x_lib/libXrandr-1.4.2/Android.mk +++ b/XServer/other_lib/x_lib/libXrandr-1.4.2/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libXrandr LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/include/X11/extensions \ $(LOCAL_PATH)/ \ diff --git a/XServer/other_lib/x_lib/libXrender-0.9.8/Android.mk b/XServer/other_lib/x_lib/libXrender-0.9.8/Android.mk index a21d5da..a603f84 100644 --- a/XServer/other_lib/x_lib/libXrender-0.9.8/Android.mk +++ b/XServer/other_lib/x_lib/libXrender-0.9.8/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libXrender LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/include/X11/extensions \ $(LOCAL_PATH)/ \ diff --git a/XServer/other_lib/x_lib/libXt-1.1.4/Android.mk b/XServer/other_lib/x_lib/libXt-1.1.4/Android.mk index 594563f..eb3bec2 100644 --- a/XServer/other_lib/x_lib/libXt-1.1.4/Android.mk +++ b/XServer/other_lib/x_lib/libXt-1.1.4/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libXt LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ diff --git a/XServer/other_lib/x_lib/libfontenc-1.1.2/Android.mk b/XServer/other_lib/x_lib/libfontenc-1.1.2/Android.mk index 70cf439..286dfe0 100644 --- a/XServer/other_lib/x_lib/libfontenc-1.1.2/Android.mk +++ b/XServer/other_lib/x_lib/libfontenc-1.1.2/Android.mk @@ -26,7 +26,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/fonts +LOCAL_COPY_HEADERS_TO := desktop/X11/fonts LOCAL_COPY_HEADERS := include/X11/fonts/fontenc.h diff --git a/XServer/other_lib/x_lib/libxcb-1.10/Android.mk b/XServer/other_lib/x_lib/libxcb-1.10/Android.mk index 5fd168d..ad96106 100644 --- a/XServer/other_lib/x_lib/libxcb-1.10/Android.mk +++ b/XServer/other_lib/x_lib/libxcb-1.10/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libxcb LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/src/ @@ -30,7 +30,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := xcb +LOCAL_COPY_HEADERS_TO := desktop/xcb LOCAL_SRCS := \ src/*.h diff --git a/XServer/other_lib/x_lib/libxkbfile-1.0.8/Android.mk b/XServer/other_lib/x_lib/libxkbfile-1.0.8/Android.mk index 907d781..eb1c211 100644 --- a/XServer/other_lib/x_lib/libxkbfile-1.0.8/Android.mk +++ b/XServer/other_lib/x_lib/libxkbfile-1.0.8/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := libxkbfile LOCAL_C_INCLUDES := \ - $(TARGET_OUT_INTERMEDIATES)/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/include/X11/extensions \ $(LOCAL_PATH)/ \ @@ -32,7 +32,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_COPY_HEADERS_TO := X11/extensions +LOCAL_COPY_HEADERS_TO := desktop/X11/extensions LOCAL_COPY_HEADERS := include/X11/extensions/XKM.h\ include/X11/extensions/XKBrules.h\ diff --git a/XServer/other_lib/x_lib/xhost-1.0.6/Android.mk b/XServer/other_lib/x_lib/xhost-1.0.6/Android.mk index e962827..711fba3 100644 --- a/XServer/other_lib/x_lib/xhost-1.0.6/Android.mk +++ b/XServer/other_lib/x_lib/xhost-1.0.6/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := xhost LOCAL_C_INCLUDES := \ - external/XServer-XSDL-android-src/jni/application/header/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ LOCAL_CFLAGS := -DHAVE_CONFIG_H -Dsethostent=abs -Dendhostent=sync diff --git a/XServer/other_lib/x_lib/xkbcomp-1.2.4/Android.mk b/XServer/other_lib/x_lib/xkbcomp-1.2.4/Android.mk index cf57b85..7a1a15f 100644 --- a/XServer/other_lib/x_lib/xkbcomp-1.2.4/Android.mk +++ b/XServer/other_lib/x_lib/xkbcomp-1.2.4/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := xkbcomp LOCAL_C_INCLUDES := \ - external/XServer-XSDL-android-src/jni/application/header/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ $(LOCAL_PATH)/include/X11 \ $(LOCAL_PATH)/include/X11/extensions \ $(LOCAL_PATH)/ \ diff --git a/XServer/other_lib/x_lib/xli-1.16/Android.mk b/XServer/other_lib/x_lib/xli-1.16/Android.mk index 9371db3..8410be4 100644 --- a/XServer/other_lib/x_lib/xli-1.16/Android.mk +++ b/XServer/other_lib/x_lib/xli-1.16/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := xli LOCAL_C_INCLUDES := \ - external/XServer-XSDL-android-src/jni/application/header/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ LOCAL_CFLAGS := -DHAVE_CONFIG_H -Drindex=strchr -include strings.h \ diff --git a/XServer/other_lib/x_lib/xsel-master/Android.mk b/XServer/other_lib/x_lib/xsel-master/Android.mk index 769d6ba..bb457e0 100644 --- a/XServer/other_lib/x_lib/xsel-master/Android.mk +++ b/XServer/other_lib/x_lib/xsel-master/Android.mk @@ -7,7 +7,7 @@ LOCAL_SDK_VERSION := 21 LOCAL_MODULE := xsel LOCAL_C_INCLUDES := \ - external/XServer-XSDL-android-src/jni/application/header/include \ + $(TARGET_OUT_INTERMEDIATES)/include/desktop \ LOCAL_CFLAGS := -DHAVE_CONFIG_H -Drpl_malloc=malloc