zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85 Commits 1 Branch 0 Tags
e3422c11696e715e66b1669230410f098bf4c038
Commit Graph

85 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Willemsen
e3422c1169 Remove __DATE__ and __TIME__ from tracing 
Including __DATE__ and __TIME__ in the binary means that every build of
this library is different, even if the sources are identical. It also
means that every OTA needs to patch this library. Remove __DATE__ and
__TIME__ from the trace build info, just record whether it's a debug or
release build.

Bug: 24204119
Change-Id: I0dfc1479f096197007db1920b89aeb61ea537168
 2015-10-22 14:46:59 -07:00
Dan Albert
be87b97f10 Merge "Fix name for NDK protobuf libraries." 2015-09-09 18:13:16 +00:00
Dan Albert
dd2ca84dea Fix name for NDK protobuf libraries. 
NDK protobuf libs are being renamed with -ndk for clarity.

Change-Id: Ida2d6e99adea2cf25453d3b5d2bbd124f45d65c3
 2015-09-08 11:00:42 -07:00
Stephen Hines
887f488ea1 Merge "Remove unnecessary neon flags and update a missing comment." 2015-08-14 22:58:31 +00:00
Stephen Hines
e9307697c8 Remove unnecessary neon flags and update a missing comment. 
-mfpu=neon collides when we have improved flags like -mfpu=neon-vfpv4
(that can be used with krait CPUs).

The prior -no-integrated-as change (which exposes this bug) was also
missing a BUG: link in the Android.mk itself.

Change-Id: I808144d4560ca579749af2aa1372f3d599890308
 2015-08-14 14:57:46 -07:00
Elliott Hughes
c7d448429f am c5067890: Merge "Add missing <string.h> and <unistd.h> includes." 
* commit 'c50678901ebef8c13c9e914eb6c6a64ed91be4b5':
  Add missing <string.h> and <unistd.h> includes.
 2015-01-27 06:31:19 +00:00
Elliott Hughes
c50678901e Merge "Add missing <string.h> and <unistd.h> includes." 2015-01-27 06:19:01 +00:00
Elliott Hughes
9ed69369c0 Add missing <string.h> and <unistd.h> includes. 
How many out of date copies of cpu-features.c do we have in the tree?

Change-Id: Ic3cbf83622186d36454fbee4e8627b6b6e30938c
 2015-01-26 22:18:07 -08:00
Jeff Davidson
3ee3b02ec0 am bcc0d3b8: Merge "Update protobuf library from 2.3 to 2.6." 
* commit 'bcc0d3b89334f32c9cbf4ca0266e6b7f551d7b9a':
  Update protobuf library from 2.3 to 2.6.
 2015-01-12 19:46:12 +00:00
Jeff Davidson
bcc0d3b893 Merge "Update protobuf library from 2.3 to 2.6." 2015-01-12 19:36:58 +00:00
Jeff Davidson
9a2fe42011 Update protobuf library from 2.3 to 2.6. 
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
 2015-01-08 16:25:06 -08:00
Ying Wang
b21f7a09b8 am c1997860: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 
* commit 'c19978607b1993da6c121d283c0841954e32cf69':
  Cleanup Obsolete LOCAL_PRELINK_MODULE.
 2014-12-16 21:01:52 +00:00
Ying Wang
c19978607b Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE." 2014-12-16 20:46:53 +00:00
Ying Wang
163d49dc4a Cleanup Obsolete LOCAL_PRELINK_MODULE. 
Bug: 18675947
Change-Id: I352b6639bdcd2ec6002d052bcd795cf008c12256
 2014-12-16 12:32:47 -08:00
Dan Albert
01b4719328 am a8b6bbff: Merge "Allow compilation with global C++11." 
* commit 'a8b6bbfff655d53ed7b1ce794708123c296e21cc':
  Allow compilation with global C++11.
 2014-11-22 20:57:17 +00:00
Dan Albert
a8b6bbfff6 Merge "Allow compilation with global C++11." 2014-11-22 20:48:59 +00:00
Dan Albert
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
Dan Albert
e05ff4ea90 am 7d252f95: Merge "Missed an stlport in webrtc." 
* commit '7d252f952a65e5cfee917258f04596e6cfe57398':
  Missed an stlport in webrtc.
 2014-11-16 17:39:15 +00:00
Dan Albert
7d252f952a Merge "Missed an stlport in webrtc." 2014-11-16 17:27:18 +00:00
Dan Albert
8728d701f7 Missed an stlport in webrtc. 
Bug: 15193147
Change-Id: I63e1a433a6b224f2f1d04ae0443321e031737a10
 2014-11-15 19:03:46 -08:00
Dan Albert
db40d03e99 am cdcb8331: Merge "Don\'t explicitly link gtest." 
* commit 'cdcb8331459b28b81b346ac59a44f7d79a72a1fb':
  Don't explicitly link gtest.
 2014-11-12 02:59:03 +00:00
Dan Albert
cdcb833145 Merge "Don't explicitly link gtest." 2014-11-12 02:45:23 +00:00
Dan Albert
02ed012922 Don't explicitly link gtest. 
Bug: 15193147
Change-Id: Ieb4ef6bc56381310a5c533246999b4f65daf3380
 2014-11-12 01:54:06 +00:00
Dan Albert
44678c2fba am 36f71b9f: Merge "Move the platform libraries to libc++." 
* commit '36f71b9f3e14d333909b826af63400c2a893f424':
  Move the platform libraries to libc++.
 2014-11-11 19:53:53 +00:00
Dan Albert
36f71b9f3e Merge "Move the platform libraries to libc++." 2014-11-11 19:28:43 +00:00
Dan Albert
b7831e07cb Move the platform libraries to libc++. 
Bug: 15193147
Change-Id: I259465ecb5bed5005c717a7e660dc6b28be52c55
 2014-11-11 10:58:41 -08:00
Dan Albert
fe2897c0d8 am ce93ad0a: am ba76eaf9: Merge "Pull in changes from the internal branch." 
* commit 'ce93ad0a42d0d9b191d16005b6614e117608803c':
  Pull in changes from the internal branch.
 2014-11-06 00:29:29 +00:00
Dan Albert
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
Dan Albert
ba76eaf9c8 Merge "Pull in changes from the internal branch." 2014-11-06 00:20:08 +00:00
Dan Albert
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
Chih-Hung Hsieh
e86570118e am d41a200b: am 8fd3f61c: Merge "Add -no-integrated-as at local level." 
* commit 'd41a200bd1a7736cd6afe08ba0fe9618a74fe36e':
 2014-10-27 02:55:42 +00:00
Chih-Hung Hsieh
bd56f2d39c am 8fd3f61c: Merge "Add -no-integrated-as at local level." 
* commit '8fd3f61c995481e581d45719458ddc237fe35f83':
  Add -no-integrated-as at local level.
 2014-10-09 22:10:47 +00:00
Chih-Hung Hsieh
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
Chih-Hung Hsieh
8fd3f61c99 Merge "Add -no-integrated-as at local level." 2014-10-09 21:06:12 +00:00
Chih-Hung Hsieh
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
Chih-Hung Hsieh
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
Chih-Hung Hsieh
84a1738586 Merge "Disable clang compiler or suppress warning." 2014-09-11 20:18:13 +00:00
Chih-Hung Hsieh
bac916e872 Disable clang compiler or suppress warning. 
BUG: 17457665
Change-Id: Idd6682f4c8684af8a0a85273e75d3f3ba013b566
 2014-09-10 13:53:23 -07:00
Ying Wang
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
Ying Wang
067ecd95d6 resolved conflicts for merge of 7d088644 to klp-modular-dev-plus-aosp 
Change-Id: Ib8e9574733170871e88bdc441597dc4130614535
 2014-05-31 09:55:17 -07:00
Ying Wang
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
Ying Wang
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
leozwang
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
Narayan Kamath
49b9845aea resolved conflicts for merge of d62aeac3 to master 
Change-Id: I0a7f0baa9054a957f88d87f463995737609d569b
 2014-03-14 10:39:53 +00:00
Ying Wang
d62aeac391 Merge "Remove "../"s in LOCAL_SRC_FILES" 2014-03-13 18:48:46 +00:00
Ying Wang
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
Elliott Hughes
5eafe7b801 am 48d24dc3: Merge "Fix build." 
* commit '48d24dc307f850add4e7314590f696721e8a42c1':
  Fix build.
 2014-03-13 17:25:20 +00:00
Elliott Hughes
48d24dc307 Merge "Fix build." 2014-03-13 00:01:48 +00:00
Elliott Hughes
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
Ying Wang
a0ed71a5b9 resolved conflicts for merge of 1b737a98 to master 
Change-Id: Id5380390ae5f55c19a07ca0f5d075f135980dc06
 2014-03-10 18:56:22 -07:00