Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1745910845, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"cb970c3c586a5bab22f640930279b368", "commit": {"type":"commit", "time": 1465238552, "time_ofs": 480, "oid_tree": { "oid": "9bdb7fb4691dd7c6da8d21b962cd0d6e72e17a3b", "alias": []}, "oid":{ "oid": "ed7c63e07d02250d2a35338242edbf269f7111f7", "alias": []}, "msg": "Android: update to use SDK Python script", "sig_commit": { "git_time": { "time": 1465238552, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1465237803, "offset": 120 }, "name": "Alexander Bruines", "email": "alexander.bruines@gmail.com", "md5": "e3bdd961ca1eed31cf61f41091438838" }}, "body": "Android: update to use SDK Python script\n\nThe latest Android SDK updates deprecate the shell script\n used to create a standalone toolchain. This patch updates the Makefile for\n the Android test-client to use the new Python script to create the standalone\n toolchains.\n" , "diff": "diff --git a/test-server/android/app/src/main/jni/NativeLibs.mk b/test-server/android/app/src/main/jni/NativeLibs.mk\nindex cec82be..14816de 100644\n--- a/test-server/android/app/src/main/jni/NativeLibs.mk\n+++ b/test-server/android/app/src/main/jni/NativeLibs.mk\n@@ -78,7 +78,7 @@ ifeq ($(APP_PLATFORM),)\n APP_PLATFORM \u003d android-21\n endif\n \n-NDK_MAKE_TOOLCHAIN :\u003d $(NDK_ROOT)/build/tools/make-standalone-toolchain.sh\n+NDK_MAKE_TOOLCHAIN :\u003d $(NDK_ROOT)/build/tools/make_standalone_toolchain.py\n \n #\n # The source packages we want/need\n@@ -141,14 +141,14 @@ TARGET_MIPS64 :\u003d mips64\n # libraries compiled for android-21 and upwards are incompatible with devices below that version!\n # http://stackoverflow.com/questions/28740315/android-ndk-getting-java-lang-unsatisfiedlinkerror-dlopen-failed-cannot-loca\n #\n-TARGET_X86_NDK_API :\u003d $(APP_PLATFORM)\n-TARGET_X86_64_NDK_API :\u003d $(APP_PLATFORM)\n-TARGET_ARM_NDK_API :\u003d $(APP_PLATFORM)\n-TARGET_ARM_V7A_NDK_API :\u003d $(APP_PLATFORM)\n-TARGET_ARM_V7A_HARD_NDK_API :\u003d $(APP_PLATFORM)\n-TARGET_ARM64_V8A_NDK_API :\u003d $(APP_PLATFORM)\n-TARGET_MIPS_NDK_API :\u003d $(APP_PLATFORM)\n-TARGET_MIPS64_NDK_API :\u003d $(APP_PLATFORM)\n+TARGET_X86_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n+TARGET_X86_64_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n+TARGET_ARM_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n+TARGET_ARM_V7A_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n+TARGET_ARM_V7A_HARD_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n+TARGET_ARM64_V8A_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n+TARGET_MIPS_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n+TARGET_MIPS64_NDK_API :\u003d $(subst android-,,$(APP_PLATFORM))\n \n # The configure arguments to pass to the OpenSSL Configure script\n # (--prefix and --openssldir are added automaticaly).\n@@ -317,71 +317,74 @@ TOOLCHAIN_ARM64_V8A :\u003d toolchains/arm64-v8a\n TOOLCHAIN_MIPS :\u003d toolchains/mips\n TOOLCHAIN_MIPS64 :\u003d toolchains/mips64\n \n-# The arch names for the different toolchains\n-TOOLCHAIN_X86_ARCH :\u003d x86\n-TOOLCHAIN_X86_64_ARCH :\u003d x86_64\n-TOOLCHAIN_ARM_ARCH :\u003d arm-linux-androideabi\n-TOOLCHAIN_ARM_V7A_ARCH :\u003d arm-linux-androideabi\n-TOOLCHAIN_ARM_V7A_HARD_ARCH :\u003d arm-linux-androideabi\n-TOOLCHAIN_ARM64_V8A_ARCH :\u003d aarch64-linux-android\n-TOOLCHAIN_MIPS_ARCH :\u003d mipsel-linux-android\n-TOOLCHAIN_MIPS64_ARCH :\u003d mips64el-linux-android\n-\n-# Other (global) toolchain settings\n-TOOLCHAIN_GCC_VERSION :\u003d 4.9\n+# Use APP_STL to determine what STL to use.\n+#\n+ifeq ($(APP_STL),stlport_static)\n+TOOLCHAIN_STL :\u003d stlport\n+else ifeq ($(APP_STL),stlport_shared)\n+TOOLCHAIN_STL :\u003d stlport\n+else ifeq ($(APP_STL),gnustl_static)\n+TOOLCHAIN_STL :\u003d gnustl\n+else ifeq ($(APP_STL),gnustl_shared)\n+TOOLCHAIN_STL :\u003d gnustl\n+else ifeq ($(APP_STL),c++_static)\n+TOOLCHAIN_STL :\u003d libc++\n+else ifeq ($(APP_STL),c++_shared)\n+TOOLCHAIN_STL :\u003d libc++\n+endif\n \n # The settings to use for the individual toolchains:\n # x86\n-TOOLCHAIN_X86_PLATFORM :\u003d $(TARGET_X86_NDK_API)\n+TOOLCHAIN_X86_API :\u003d $(TARGET_X86_NDK_API)\n TOOLCHAIN_X86_PREFIX :\u003d i686-linux-android\n TOOLCHAIN_X86_FLAGS :\u003d -march\u003di686 -msse3 -mstackrealign -mfpmath\u003dsse\n TOOLCHAIN_X86_LINK :\u003d\n TOOLCHAIN_X86_PLATFORM_HEADERS :\u003d $(shell pwd)/$(TOOLCHAIN_X86)/sysroot/usr/include\n TOOLCHAIN_X86_PLATFORM_LIBS :\u003d $(shell pwd)/$(TOOLCHAIN_X86)/sysroot/usr/lib\n # x86_64\n-TOOLCHAIN_X86_64_PLATFORM :\u003d $(TARGET_X86_64_NDK_API)\n+TOOLCHAIN_X86_64_API :\u003d $(TARGET_X86_64_NDK_API)\n TOOLCHAIN_X86_64_PREFIX :\u003d x86_64-linux-android\n TOOLCHAIN_X86_64_FLAGS :\u003d\n TOOLCHAIN_X86_64_LINK :\u003d\n TOOLCHAIN_X86_64_PLATFORM_HEADERS :\u003d $(shell pwd)/$(TOOLCHAIN_X86_64)/sysroot/usr/include\n TOOLCHAIN_X86_64_PLATFORM_LIBS :\u003d $(shell pwd)/$(TOOLCHAIN_X86_64)/sysroot/usr/lib\n # arm\n-TOOLCHAIN_ARM_PLATFORM :\u003d $(TARGET_ARM_NDK_API)\n+TOOLCHAIN_ARM_API :\u003d $(TARGET_ARM_NDK_API)\n TOOLCHAIN_ARM_PREFIX :\u003d arm-linux-androideabi\n TOOLCHAIN_ARM_FLAGS :\u003d -mthumb\n TOOLCHAIN_ARM_LINK :\u003d\n TOOLCHAIN_ARM_PLATFORM_HEADERS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM)/sysroot/usr/include\n TOOLCHAIN_ARM_PLATFORM_LIBS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM)/sysroot/usr/lib\n # arm-v7a\n-TOOLCHAIN_ARM_V7A_PLATFORM :\u003d $(TARGET_ARM_V7A_NDK_API)\n+TOOLCHAIN_ARM_V7A_API :\u003d $(TARGET_ARM_V7A_NDK_API)\n TOOLCHAIN_ARM_V7A_PREFIX :\u003d arm-linux-androideabi\n TOOLCHAIN_ARM_V7A_FLAGS :\u003d -march\u003darmv7-a -mfloat-abi\u003dsoftfp -mfpu\u003dvfpv3-d16\n TOOLCHAIN_ARM_V7A_LINK :\u003d -march\u003darmv7-a -Wl,--fix-cortex-a8\n TOOLCHAIN_ARM_V7A_PLATFORM_HEADERS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM_V7A)/sysroot/usr/include\n TOOLCHAIN_ARM_V7A_PLATFORM_LIBS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM_V7A)/sysroot/usr/lib\n # arm-v7a-hard\n-TOOLCHAIN_ARM_V7A_HARD_PLATFORM :\u003d $(TARGET_ARM_V7A_HARD_NDK_API)\n+TOOLCHAIN_ARM_V7A_HARD_API :\u003d $(TARGET_ARM_V7A_HARD_NDK_API)\n TOOLCHAIN_ARM_V7A_HARD_PREFIX :\u003d arm-linux-androideabi\n TOOLCHAIN_ARM_V7A_HARD_FLAGS :\u003d -march\u003darmv7-a -mfpu\u003dvfpv3-d16 -mhard-float -mfloat-abi\u003dhard -D_NDK_MATH_NO_SOFTFP\u003d1\n TOOLCHAIN_ARM_V7A_HARD_LINK :\u003d -march\u003darmv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard\n TOOLCHAIN_ARM_V7A_HARD_PLATFORM_HEADERS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM_V7A_HARD)/sysroot/usr/include\n TOOLCHAIN_ARM_V7A_HARD_PLATFORM_LIBS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM_V7A_HARD)/sysroot/usr/lib\n # arm64-v8a\n-TOOLCHAIN_ARM64_V8A_PLATFORM :\u003d $(TARGET_ARM64_V8A_NDK_API)\n+TOOLCHAIN_ARM64_V8A_API :\u003d $(TARGET_ARM64_V8A_NDK_API)\n TOOLCHAIN_ARM64_V8A_PREFIX :\u003d aarch64-linux-android\n TOOLCHAIN_ARM64_V8A_FLAGS :\u003d\n TOOLCHAIN_ARM64_V8A_LINK :\u003d\n TOOLCHAIN_ARM64_V8A_PLATFORM_HEADERS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM64_V8A)/sysroot/usr/include\n TOOLCHAIN_ARM64_V8A_PLATFORM_LIBS :\u003d $(shell pwd)/$(TOOLCHAIN_ARM64_V8A)/sysroot/usr/lib\n # mips\n-TOOLCHAIN_MIPS_PLATFORM :\u003d $(TARGET_MIPS_NDK_API)\n+TOOLCHAIN_MIPS_API :\u003d $(TARGET_MIPS_NDK_API)\n TOOLCHAIN_MIPS_PREFIX :\u003d mipsel-linux-android\n TOOLCHAIN_MIPS_FLAGS :\u003d\n TOOLCHAIN_MIPS_LINK :\u003d\n TOOLCHAIN_MIPS_PLATFORM_HEADERS :\u003d $(shell pwd)/$(TOOLCHAIN_MIPS)/sysroot/usr/include\n TOOLCHAIN_MIPS_PLATFORM_LIBS :\u003d $(shell pwd)/$(TOOLCHAIN_MIPS)/sysroot/usr/lib\n # mips64\n-TOOLCHAIN_MIPS64_PLATFORM :\u003d $(TARGET_MIPS64_NDK_API)\n+TOOLCHAIN_MIPS64_API :\u003d $(TARGET_MIPS64_NDK_API)\n TOOLCHAIN_MIPS64_PREFIX :\u003d mips64el-linux-android\n TOOLCHAIN_MIPS64_FLAGS :\u003d\n TOOLCHAIN_MIPS64_LINK :\u003d\n@@ -703,52 +706,116 @@ toolchain-mips: $(TOOLCHAIN_MIPS)\n toolchain-mips64: $(TOOLCHAIN_MIPS64)\n \n $(TOOLCHAIN_X86):\n+ifneq ($(TOOLCHAIN_STL),)\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_X86_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_X86_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_X86)\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_X86_API) \u005c\n+\t --arch x86 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_X86)\n+else\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --api $(TOOLCHAIN_X86_API) \u005c\n+\t --arch x86 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_X86)\n+endif\n \n $(TOOLCHAIN_X86_64):\n+ifneq ($(TOOLCHAIN_STL),)\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_X86_64_API) \u005c\n+\t --arch x86_64 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_X86_64)\n+else\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_X86_64_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_X86_64_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_X86_64)\n+\t --api $(TOOLCHAIN_X86_64_API) \u005c\n+\t --arch x86_64 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_X86_64)\n+endif\n \n $(TOOLCHAIN_ARM):\n+ifneq ($(TOOLCHAIN_STL),)\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_ARM_API) \u005c\n+\t --arch arm \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM)\n+else\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_ARM_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_ARM_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_ARM)\n+\t --api $(TOOLCHAIN_ARM_API) \u005c\n+\t --arch arm \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM)\n+endif\n \n $(TOOLCHAIN_ARM_V7A):\n+ifneq ($(TOOLCHAIN_STL),)\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_ARM_V7A_API) \u005c\n+\t --arch arm \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM_V7A)\n+else\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_ARM_V7A_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_ARM_V7A_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_ARM_V7A)\n+\t --api $(TOOLCHAIN_ARM_V7A_API) \u005c\n+\t --arch arm \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM_V7A)\n+endif\n \n $(TOOLCHAIN_ARM_V7A_HARD):\n+ifneq ($(TOOLCHAIN_STL),)\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_ARM_V7A_HARD_API) \u005c\n+\t --arch arm \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM_V7A_HARD)\n+else\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_ARM_V7A_HARD_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_ARM_V7A_HARD_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_ARM_V7A_HARD)\n+\t --api $(TOOLCHAIN_ARM_V7A_HARD_API) \u005c\n+\t --arch arm \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM_V7A_HARD)\n+endif\n \n $(TOOLCHAIN_ARM64_V8A):\n+ifneq ($(TOOLCHAIN_STL),)\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_ARM64_V8A_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_ARM64_V8A_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_ARM64_V8A)\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_ARM64_V8A_API) \u005c\n+\t --arch arm64 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM64_V8A)\n+else\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --api $(TOOLCHAIN_ARM64_V8A_API) \u005c\n+\t --arch arm64 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_ARM64_V8A)\n+endif\n \n $(TOOLCHAIN_MIPS):\n+ifneq ($(TOOLCHAIN_STL),)\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_MIPS_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_MIPS_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_MIPS)\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_MIPS_API) \u005c\n+\t --arch mips \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_MIPS)\n+else\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --api $(TOOLCHAIN_MIPS_API) \u005c\n+\t --arch mips \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_MIPS)\n+endif\n \n $(TOOLCHAIN_MIPS64):\n+ifneq ($(TOOLCHAIN_STL),)\n \t$(NDK_MAKE_TOOLCHAIN) \u005c\n-\t --platform\u003d$(TOOLCHAIN_MIPS64_PLATFORM) \u005c\n-\t --toolchain\u003d$(TOOLCHAIN_MIPS64_ARCH)-$(TOOLCHAIN_GCC_VERSION) \u005c\n-\t --install-dir\u003d$(shell pwd)/$(TOOLCHAIN_MIPS64)\n+\t --stl $(TOOLCHAIN_STL) \u005c\n+\t --api $(TOOLCHAIN_MIPS64_API) \u005c\n+\t --arch mips64 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_MIPS64)\n+else\n+\t$(NDK_MAKE_TOOLCHAIN) \u005c\n+\t --api $(TOOLCHAIN_MIPS64_API) \u005c\n+\t --arch mips64 \u005c\n+\t --install-dir $(shell pwd)/$(TOOLCHAIN_MIPS64)\n+endif\n \n #\n # Rules to build zlib\n","s":{"c":1745910845,"u": 1721}} ],"g": 3970,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}