build/stlport/android-mozilla-config.patch@129ffea94266
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.
1 diff --git a/stlport/stl/config/_android.h b/stlport/stl/config/_android.h
2 --- a/stlport/stl/config/_android.h
3 +++ b/stlport/stl/config/_android.h
4 @@ -10,18 +10,18 @@
5 #define _PTHREADS
7 // Don't have native <cplusplus> headers
8 #define _STLP_HAS_NO_NEW_C_HEADERS 1
10 // Use unix for streams
11 #define _STLP_USE_UNIX_IO 1
13 -// We do have rtti support now through GAbi++
14 -#undef _STLP_NO_RTTI
15 +// We don't want rtti support
16 +#define _STLP_NO_RTTI 1
18 // C library is in the global namespace.
19 #define _STLP_VENDOR_GLOBAL_CSTD 1
21 // Don't have underlying local support.
22 #undef _STLP_REAL_LOCALE_IMPLEMENTED
24 // No pthread_spinlock_t in Android
25 @@ -32,48 +32,42 @@
27 // Little endian platform.
28 #define _STLP_LITTLE_ENDIAN 1
30 // No <exception> headers
31 #undef _STLP_NO_EXCEPTION_HEADER
33 // No throwing exceptions
34 -#undef _STLP_NO_EXCEPTIONS
35 -
36 +#define _STLP_NO_EXCEPTIONS 1
37 +#define _STLP_NO_EXCEPTION_HEADER 1
39 // No need to define our own namespace
40 #define _STLP_NO_OWN_NAMESPACE 1
42 // Use __new_alloc instead of __node_alloc, so we don't need static functions.
43 #define _STLP_USE_SIMPLE_NODE_ALLOC 1
45 // Don't use extern versions of range errors, so we don't need to
46 // compile as a library.
47 #define _STLP_USE_NO_EXTERN_RANGE_ERRORS 1
49 // The system math library doesn't have long double variants, e.g
50 // sinl, cosl, etc
51 #define _STLP_NO_VENDOR_MATH_L 1
53 -// Define how to include our native headers.
54 -#define _STLP_NATIVE_HEADER(header) <usr/include/header>
55 -#define _STLP_NATIVE_C_HEADER(header) <../include/header>
56 -#define _STLP_NATIVE_CPP_C_HEADER(header) <../../gabi++/include/header>
57 -#define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <../../gabi++/include/header>
58 -#define _STLP_NATIVE_OLD_STREAMS_HEADER(header) <usr/include/header>
59 -
60 // Include most of the gcc settings.
61 #include <stl/config/_gcc.h>
63 // Do not use glibc, Android is missing some things.
64 #undef _STLP_USE_GLIBC
66 // No exceptions.
67 -#undef _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT
68 -#undef _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT
69 +#define _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT 1
70 +#define _STLP_NO_UNEXPECTED_EXCEPT_SUPPORT 1
72 -#ifndef _ANDROID_NDK_BLAZE_
73 -// Android does have include_next but it doesn't work well in our build system.
74 -#undef _STLP_HAS_INCLUDE_NEXT
75 -#endif
76 +#define _STLP_HAS_INCLUDE_NEXT 1
77 +
78 +// Use operator new instead of stlport own node allocator
79 +#undef _STLP_USE_NEWALLOC
80 +#define _STLP_USE_NEWALLOC 1
82 #endif /* __stl_config__android_h */
