build/stlport/android-mozilla-config.patch@129ffea94266 (annotated)
build/stlport/android-mozilla-config.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h |
| michael@0 | 2 | --- a/stlport/stl/config/_android.h |
| michael@0 | 3 | +++ b/stlport/stl/config/_android.h |
| michael@0 | 4 | @@ -10,18 +10,18 @@ |
| michael@0 | 5 | #define _PTHREADS |
| michael@0 | 6 | |
| michael@0 | 7 | // Don't have native <cplusplus> headers |
| michael@0 | 8 | #define _STLP_HAS_NO_NEW_C_HEADERS 1 |
| michael@0 | 9 | |
| michael@0 | 10 | // Use unix for streams |
| michael@0 | 11 | #define _STLP_USE_UNIX_IO 1 |
| michael@0 | 12 | |
| michael@0 | 13 | -// We do have rtti support now through GAbi++ |
| michael@0 | 14 | -#undef _STLP_NO_RTTI |
| michael@0 | 15 | +// We don't want rtti support |
| michael@0 | 16 | +#define _STLP_NO_RTTI 1 |
| michael@0 | 17 | |
| michael@0 | 18 | // C library is in the global namespace. |
| michael@0 | 19 | #define _STLP_VENDOR_GLOBAL_CSTD 1 |
| michael@0 | 20 | |
| michael@0 | 21 | // Don't have underlying local support. |
| michael@0 | 22 | #undef _STLP_REAL_LOCALE_IMPLEMENTED |
| michael@0 | 23 | |
| michael@0 | 24 | // No pthread_spinlock_t in Android |
| michael@0 | 25 | @@ -32,48 +32,42 @@ |
| michael@0 | 26 | |
| michael@0 | 27 | // Little endian platform. |
| michael@0 | 28 | #define _STLP_LITTLE_ENDIAN 1 |
| michael@0 | 29 | |
| michael@0 | 30 | // No <exception> headers |
| michael@0 | 31 | #undef _STLP_NO_EXCEPTION_HEADER |
| michael@0 | 32 | |
| michael@0 | 33 | // No throwing exceptions |
| michael@0 | 34 | -#undef _STLP_NO_EXCEPTIONS |
| michael@0 | 35 | - |
| michael@0 | 36 | +#define _STLP_NO_EXCEPTIONS 1 |
| michael@0 | 37 | +#define _STLP_NO_EXCEPTION_HEADER 1 |
| michael@0 | 38 | |
| michael@0 | 39 | // No need to define our own namespace |
| michael@0 | 40 | #define _STLP_NO_OWN_NAMESPACE 1 |
| michael@0 | 41 | |
| michael@0 | 42 | // Use __new_alloc instead of __node_alloc, so we don't need static functions. |
| michael@0 | 43 | #define _STLP_USE_SIMPLE_NODE_ALLOC 1 |
| michael@0 | 44 | |
| michael@0 | 45 | // Don't use extern versions of range errors, so we don't need to |
| michael@0 | 46 | // compile as a library. |
| michael@0 | 47 | #define _STLP_USE_NO_EXTERN_RANGE_ERRORS 1 |
| michael@0 | 48 | |
| michael@0 | 49 | // The system math library doesn't have long double variants, e.g |
| michael@0 | 50 | // sinl, cosl, etc |
| michael@0 | 51 | #define _STLP_NO_VENDOR_MATH_L 1 |
| michael@0 | 52 | |
| michael@0 | 53 | -// Define how to include our native headers. |
| michael@0 | 54 | -#define _STLP_NATIVE_HEADER(header) <usr/include/header> |
| michael@0 | 55 | -#define _STLP_NATIVE_C_HEADER(header) <../include/header> |
| michael@0 | 56 | -#define _STLP_NATIVE_CPP_C_HEADER(header) <../../gabi++/include/header> |
| michael@0 | 57 | -#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../../gabi++/include/header> |
| michael@0 | 58 | -#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <usr/include/header> |
| michael@0 | 59 | - |
| michael@0 | 60 | // Include most of the gcc settings. |
| michael@0 | 61 | #include <stl/config/_gcc.h> |
| michael@0 | 62 | |
| michael@0 | 63 | // Do not use glibc, Android is missing some things. |
| michael@0 | 64 | #undef _STLP_USE_GLIBC |
| michael@0 | 65 | |
| michael@0 | 66 | // No exceptions. |
| michael@0 | 67 | -#undef _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT |
| michael@0 | 68 | -#undef _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT |
| michael@0 | 69 | +#define _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT 1 |
| michael@0 | 70 | +#define _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT 1 |
| michael@0 | 71 | |
| michael@0 | 72 | -#ifndef _ANDROID_NDK_BLAZE_ |
| michael@0 | 73 | -// Android does have include_next but it doesn't work well in our build system. |
| michael@0 | 74 | -#undef _STLP_HAS_INCLUDE_NEXT |
| michael@0 | 75 | -#endif |
| michael@0 | 76 | +#define _STLP_HAS_INCLUDE_NEXT 1 |
| michael@0 | 77 | + |
| michael@0 | 78 | +// Use operator new instead of stlport own node allocator |
| michael@0 | 79 | +#undef _STLP_USE_NEWALLOC |
| michael@0 | 80 | +#define _STLP_USE_NEWALLOC 1 |
| michael@0 | 81 | |
| michael@0 | 82 | #endif /* __stl_config__android_h */ |
