Change-Id: I6283b1546b94f37e0c4b25b9c3c298429bd72e3c
This commit is contained in:
2020-01-14 20:01:53 +08:00
parent ef21f4d7fa
commit 6e70d72b30
41 changed files with 58 additions and 49 deletions

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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)

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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 \

View File

@@ -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

View File

@@ -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 \

View File

@@ -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

View File

@@ -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)

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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)/ \

View File

@@ -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)/ \

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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)/ \

View File

@@ -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)/ \

View File

@@ -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)/ \

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -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\

View File

@@ -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

View File

@@ -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)/ \

View File

@@ -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 \

View File

@@ -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