bcc0d3b893
Merge "Update protobuf library from 2.3 to 2.6."
2015-01-12 19:36:58 +00:00
9a2fe42011
Update protobuf library from 2.3 to 2.6.
...
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2015-01-08 16:25:06 -08:00
c19978607b
Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
2014-12-16 20:46:53 +00:00
163d49dc4a
Cleanup Obsolete LOCAL_PRELINK_MODULE.
...
Bug: 18675947
Change-Id: I352b6639bdcd2ec6002d052bcd795cf008c12256
2014-12-16 12:32:47 -08:00
a8b6bbfff6
Merge "Allow compilation with global C++11."
2014-11-22 20:48:59 +00:00
bf8bc5cd91
Allow compilation with global C++11.
...
spreadsort.hpp used a template parameter named `getchar`. In early
versions of the NDK (such as the one used by this project), getchar is
defined as a macro. For whatever reason, C++11 affects this behavior,
so explicitly use the default standard version (gnu++98).
Change-Id: I356c2c0886f1c5436732c902a6d22ccfd25bf725
2014-11-22 10:34:51 -08:00
7d252f952a
Merge "Missed an stlport in webrtc."
2014-11-16 17:27:18 +00:00
8728d701f7
Missed an stlport in webrtc.
...
Bug: 15193147
Change-Id: I63e1a433a6b224f2f1d04ae0443321e031737a10
2014-11-15 19:03:46 -08:00
cdcb833145
Merge "Don't explicitly link gtest."
2014-11-12 02:45:23 +00:00
02ed012922
Don't explicitly link gtest.
...
Bug: 15193147
Change-Id: Ieb4ef6bc56381310a5c533246999b4f65daf3380
2014-11-12 01:54:06 +00:00
36f71b9f3e
Merge "Move the platform libraries to libc++."
2014-11-11 19:28:43 +00:00
b7831e07cb
Move the platform libraries to libc++.
...
Bug: 15193147
Change-Id: I259465ecb5bed5005c717a7e660dc6b28be52c55
2014-11-11 10:58:41 -08:00
ce93ad0a42
am ba76eaf9: Merge "Pull in changes from the internal branch."
...
* commit 'ba76eaf9c814724c43b637d256ed2ebd1186a515':
Pull in changes from the internal branch.
2014-11-06 00:24:36 +00:00
ba76eaf9c8
Merge "Pull in changes from the internal branch."
2014-11-06 00:20:08 +00:00
f335f5f4fd
Pull in changes from the internal branch.
...
These are all just makefile cleanups... No reason to keep them secret
from the world.
Change-Id: Ica61f09d5d63a95a51ca0a489e7248fb61609ce1
2014-11-05 16:12:21 -08:00
d41a200bd1
am 8fd3f61c: Merge "Add -no-integrated-as at local level."
...
* commit '8fd3f61c995481e581d45719458ddc237fe35f83':
Add -no-integrated-as at local level.
2014-10-09 22:07:08 +00:00
8fd3f61c99
Merge "Add -no-integrated-as at local level."
2014-10-09 21:06:12 +00:00
a0f8c621a2
Add -no-integrated-as at local level.
...
Later we will enable integrated-as as default at the global level.
BUG: 17820427
Change-Id: I51f4ce3ead62c705dd14e46239ce6038a0097741
2014-10-09 11:53:49 -07:00
53d779af73
am 84a17385: Merge "Disable clang compiler or suppress warning."
...
* commit '84a1738586b1f041adec40fa593eafea51f69fb8':
Disable clang compiler or suppress warning.
2014-09-12 05:59:24 +00:00
84a1738586
Merge "Disable clang compiler or suppress warning."
2014-09-11 20:18:13 +00:00
bac916e872
Disable clang compiler or suppress warning.
...
BUG: 17457665
Change-Id: Idd6682f4c8684af8a0a85273e75d3f3ba013b566
2014-09-10 13:53:23 -07:00
96907bb2db
am 067ecd95: resolved conflicts for merge of 7d088644 to klp-modular-dev-plus-aosp
...
* commit '067ecd95d60f00da186c117e7cb437693872d416':
Remove "../"s in LOCAL_SRC_FILES [DO NOT MERGE]
2014-05-31 16:58:25 +00:00
067ecd95d6
resolved conflicts for merge of 7d088644 to klp-modular-dev-plus-aosp
...
Change-Id: Ib8e9574733170871e88bdc441597dc4130614535
2014-05-31 09:55:17 -07:00
7d08864492
am 053904f5: Remove "../"s in LOCAL_SRC_FILES [DO NOT MERGE]
...
* commit '053904f5dfafecd068135af3bce8e45874cfc530':
Remove "../"s in LOCAL_SRC_FILES [DO NOT MERGE]
2014-05-31 11:44:04 +00:00
053904f5df
Remove "../"s in LOCAL_SRC_FILES [DO NOT MERGE]
...
"../" leads to object files spilling out of the module's intermediate
directory and causes build race condition.
Change-Id: I0f503b2ecca391b5255848e1ed6b56a898753ae8
2014-05-31 05:18:01 +00:00
d386a80716
Remove ndk_build from platform makefile.
...
Webrtc used to support both platform build and ndk build in a single makefile.
However, ndk build should be done by gyp, no need to support ndk build in android
makefile, remove NDK_ROOT.
Change-Id: I73c4ab84cec9f4f2d75ec21a50e420f9b076fce4
2014-05-07 15:44:48 -07:00
49b9845aea
resolved conflicts for merge of d62aeac3 to master
...
Change-Id: I0a7f0baa9054a957f88d87f463995737609d569b
2014-03-14 10:39:53 +00:00
d62aeac391
Merge "Remove "../"s in LOCAL_SRC_FILES"
2014-03-13 18:48:46 +00:00
056a3c3e34
Remove "../"s in LOCAL_SRC_FILES
...
"../" leads to object files spilling out of the module's intermediate
directory and causes build race condition.
Change-Id: I0f503b2ecca391b5255848e1ed6b56a898753ae8
2014-03-13 11:44:57 -07:00
5eafe7b801
am 48d24dc3: Merge "Fix build."
...
* commit '48d24dc307f850add4e7314590f696721e8a42c1':
Fix build.
2014-03-13 17:25:20 +00:00
48d24dc307
Merge "Fix build."
2014-03-13 00:01:48 +00:00
dc5deb4b48
Fix build.
...
Specifically:
external/webrtc/src/modules/audio_coding/codecs/isac/fix/source/../test/kenny.c:366: error: undefined reference to 'atof'
The real problem here is that this code is compiling against the platform
bionic headers but linking against the NDK C library. That's a terrible
idea, but I can't understand the makefile well enough to stop that.
This fixes the build by using a function that's common to both C libraries.
Change-Id: I3d5747014a45269520a4c3585be42f2a78293d86
2014-03-12 16:59:19 -07:00
a0ed71a5b9
resolved conflicts for merge of 1b737a98 to master
...
Change-Id: Id5380390ae5f55c19a07ca0f5d075f135980dc06
2014-03-10 18:56:22 -07:00
1b737a98f4
Merge "Only build neon code for arm but not arm64."
2014-03-11 01:34:52 +00:00
9fb5517a05
Only build neon code for arm but not arm64.
...
This fixed aosp_arm64 build.
Change-Id: Ic4840c57a7d2b68c199c725c35d61f85adfee9e7
2014-03-10 18:20:19 -07:00
7aa40dbb7b
am 381d47ca: Merge "Fix neon flags."
...
* commit '381d47ca53d4ce26ffc55897b6303fe4e46be4c4':
Fix neon flags.
2014-03-11 00:42:07 +00:00
99d7cbd234
resolved conflicts for merge of 3cc82c99 to master
...
Change-Id: Ib23fa837ba685943794252ad53352e1e7a741ab8
2014-03-10 17:36:13 -07:00
381d47ca53
Merge "Fix neon flags."
2014-03-11 00:27:23 +00:00
446440a7f6
Fix neon flags.
...
Change-Id: I54bcb78292b1a807c4fb1a1912d81ecea8033e63
2014-03-10 17:26:14 -07:00
3cc82c997f
Merge "Use arch specific flags to fix multilib build."
2014-03-10 23:53:16 +00:00
792d546415
Use arch specific flags to fix multilib build.
...
Bug: 13391438
Change-Id: Ie9844df210c7ea24da952811ba854850fc17ded9
2014-03-10 15:26:43 -07:00
f99e290ae1
resolved conflicts for merge of a688b4b8 to master
...
Change-Id: I48bc5ab0e64aed4b0a26a68ec4f8ff505787ad60
2014-02-28 18:32:01 -08:00
a688b4b849
Merge "Fix misuse of $(my-dir)."
2014-03-01 02:09:45 +00:00
789c38cf1a
Fix misuse of $(my-dir).
...
Change-Id: I68512b022539a861ef2e338410229fd21a5da67b
2014-02-28 18:04:01 -08:00
86ba294d25
am 148d5389: Merge "AArch64: Add AArch64 to webrtc typedefs"
...
* commit '148d5389f1c24942f0c8e5d011a2c8d123f817c9':
AArch64: Add AArch64 to webrtc typedefs
2013-12-17 22:17:40 +00:00
148d5389f1
Merge "AArch64: Add AArch64 to webrtc typedefs"
2013-12-17 22:03:06 +00:00
504679fd92
AArch64: Add AArch64 to webrtc typedefs
...
Change-Id: I34ca53b1dd3d56b8df6f7c5440e2cf49db4c7546
Signed-off-by: Craig Barber <craig.barber@arm.com >
2013-12-17 13:33:06 +00:00
32e2cd785a
Fix for the webrtc_isac_test_gnustl_static build error.
...
Moved webrts_isac_test and webrtc_isac_test_gnustl_static targets
to a separate makefile. Build error was caused by "../kenny.c" src
file - build system was building kenny.o outside of intermediates directory
(out/target/product/generic/obj/EXECUTABLES/webrtc_isac_test_gnustl_static_intermediates/../test/kenny.o).
This somehow, sometimes caused webrtc_isac_test_gnustl_static binary being build
BEFORE kenny.o file was built.
Change-Id: Iaa4a31327d8d381c6cc7f676583985259dd14d83
2013-09-30 16:04:53 +01:00
7e1c884ad4
am ef0a049f: Merge "webrtc: Backport asm fixes from webrtc trunk"
...
* commit 'ef0a049f46480de9b1875ce415bcec6808dafa1f':
webrtc: Backport asm fixes from webrtc trunk
2013-09-27 15:15:34 -07:00
ef0a049f46
Merge "webrtc: Backport asm fixes from webrtc trunk"
2013-09-27 22:08:35 +00:00
