Ian Rogers
577184aa86
Merge "Test __GLIBC__ is defined before using its value."
2014-09-26 15:45:40 +00:00
Stephen Hines
f00896663e
Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.
...
These aren't needed now that we only use the compiler/headers that exist in
the prebuilts/clang directory.
Change-Id: I9978efb10815e92577d45629db324e0a5094f880
2014-09-25 22:35:16 -07:00
Ian Rogers
850a4cb72b
Test __GLIBC__ is defined before using its value.
...
Avoids -Wundef warning.
Change-Id: I52d8223500fe31cdf7023e32e96df75e33eb2f7e
2014-09-25 17:34:40 -07:00
Brett Chabot
d771c0971a
am fa63bb72
: Merge "Remove cts dependency on ddmlib" into lmp-dev
...
* commit 'fa63bb72c980a12178bf7e150988a851619a1bd6':
Remove cts dependency on ddmlib
2014-09-25 21:15:57 +00:00
Brett Chabot
fa63bb72c9
Merge "Remove cts dependency on ddmlib" into lmp-dev
2014-09-25 21:09:41 +00:00
Brett Chabot
cf1d2b1796
Remove cts dependency on ddmlib
...
Its now included in tradefed-prebuilt.
Bug: 17649015
Change-Id: I058bed467fb739a311b0645b7da6a6b72497c290
2014-09-25 12:38:36 -07:00
Jeff Arneson
5925fd13e8
am 151c7277
: Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
...
* commit '151c727736bfea2336383ee82414702fdd80a0b6':
Refactor show_annotations_list to remove HTML tags from method params
2014-09-25 03:56:53 +00:00
Jeff Arneson
151c727736
Merge "Refactor show_annotations_list to remove HTML tags from method params" into lmp-dev
2014-09-25 03:45:50 +00:00
Dianne Hackborn
a0fdca5e79
am e105b8f2
: Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
...
* commit 'e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4':
And then L, without ever becoming a real code name, transforms like magic to 5.0.
2014-09-25 00:40:56 +00:00
Dianne Hackborn
e105b8f2d3
Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
2014-09-25 00:28:33 +00:00
Lai Wei-Chih
8affa161fe
Use new variable LLVM_PREBUILTS_VERSION to simplify path construction.
...
This removes the hard-coded '3.5' in the various paths and makes switching to
a new toolchain easier from the command line (m LLVM_PREBUILTS_VERSION=3.6).
Change-Id: I46b10eb2fc177a03528de9c7b433f8647f632081
2014-09-24 14:59:00 -07:00
Ying Wang
1b2c472579
am a47420a2
: Break package-modules build recipe to mutliple lines
...
* commit 'a47420a22d83fb5707cb971d98961f87e667ffe8':
Break package-modules build recipe to mutliple lines
2014-09-24 17:50:44 +00:00
Ying Wang
a47420a22d
Break package-modules build recipe to mutliple lines
...
To fix "Argument list too long" error seen on some machines.
Change-Id: I6f34668e938412751e257b4b543358e1fc0809a1
2014-09-24 10:19:14 -07:00
Dan Albert
7655a97984
resolved conflicts for merge of 326f9450
to lmp-dev-plus-aosp
...
Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e
2014-09-24 09:42:39 -07:00
Dan Albert
326f9450f0
am 33029248
: Merge "Add option for generating coverage info."
...
* commit '330292480272aed3d7663ae7a7668675c742b2e0':
Add option for generating coverage info.
2014-09-24 16:13:18 +00:00
Dan Albert
3302924802
Merge "Add option for generating coverage info."
2014-09-24 16:03:27 +00:00
Dan Albert
4bbc6c790b
Add option for generating coverage info.
...
To enable building with coverage, the environment variable
NATIVE_COVERAGE must be set to true.
Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for
a given component.
This is currently not supported for clang (b/17574078, b/17583330).
If static library A is included in a binary B (dynamic or static
executable, or shared library), and A is built with coverage
information, B is required to link with libgcov.a. Since the make does
not offer a good way to track this dependency, link libgcov.a even if
LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE).
This ensures that all of the libgcov dependencies will always be
resolved, and causes no change in the resulting binary if coverage is
not used.
Bug: 10134489
Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
2014-09-23 15:19:02 -07:00
Elliott Hughes
f811b82b4d
am 31f21208
: am cb0755f8
: Merge "Remove unused HAVE_OFF64_T."
...
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
Remove unused HAVE_OFF64_T.
2014-09-23 21:37:05 +00:00
Elliott Hughes
31f2120848
am cb0755f8
: Merge "Remove unused HAVE_OFF64_T."
...
* commit 'cb0755f8c92c252331614bee7bceeb897357e0f1':
Remove unused HAVE_OFF64_T.
2014-09-23 21:30:09 +00:00
Elliott Hughes
cb0755f8c9
Merge "Remove unused HAVE_OFF64_T."
2014-09-23 21:23:21 +00:00
Elliott Hughes
8fe8dc83e3
Remove unused HAVE_OFF64_T.
...
Change-Id: I24acf64efcd0fd84d5dda342d4c4293fa59fae1a
2014-09-23 13:36:01 -07:00
Elliott Hughes
0b1529d064
am 5d76f9e8
: am 88c7544e
: Merge "Remove the unused IPC macros."
...
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
Remove the unused IPC macros.
2014-09-23 16:16:48 +00:00
Elliott Hughes
5d76f9e8c8
am 88c7544e
: Merge "Remove the unused IPC macros."
...
* commit '88c7544e711e70273b3ab29251ba2ff359a7ea1a':
Remove the unused IPC macros.
2014-09-23 16:11:03 +00:00
Elliott Hughes
88c7544e71
Merge "Remove the unused IPC macros."
2014-09-23 16:01:14 +00:00
Elliott Hughes
76ab00f189
Remove the unused IPC macros.
...
There are still a couple of references to HAVE_WIN32_IPC to be dealt with
later.
Change-Id: Id131fbf2e96d4c1c7bb98629779045375bd5f85f
2014-09-22 20:43:32 -07:00
Elliott Hughes
c08b4f0389
am 50bd6b99
: am c65d93f6
: Merge "build: remove HAVE_OOM_ADJ"
...
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
build: remove HAVE_OOM_ADJ
2014-09-23 02:09:15 +00:00
Elliott Hughes
50bd6b9979
am c65d93f6
: Merge "build: remove HAVE_OOM_ADJ"
...
* commit 'c65d93f6964a313f64fee031d8dcdbe996a7204d':
build: remove HAVE_OOM_ADJ
2014-09-23 01:54:23 +00:00
Elliott Hughes
c65d93f696
Merge "build: remove HAVE_OOM_ADJ"
2014-09-23 01:49:10 +00:00
Todd Poynor
9c226d1f9e
build: remove HAVE_OOM_ADJ
...
This define is no longer used.
Change-Id: I6615d6e4aa09f71b7c4c435ccb83a07bba91b6dc
2014-09-22 18:47:48 -07:00
Dianne Hackborn
105df2f1d2
And then L, without ever becoming a real code name, transforms like magic to 5.0.
...
The code name looked at 5.0 despondently. "Won't anyone care about
me? Why does everyone pretend like I don't even exist!" And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.
But 5.0 knew better. "L," the number said, "don't you fear. Some
day, I am sure, your name will go up in lights. Your name will shine
brighter than even my own. And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."
L could only hope this would be true. But not today. Today, L
is still nobody.
Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
2014-09-22 15:55:23 -07:00
Stephen Smalley
704744ad81
Add domains for goldfish services.
...
goldfish-setup, goldfish-logcat, and qemu-props are goldfish-specific
oneshot services that lacked domain definitions and thus were left in init's
domain.
This depends on a change to external/sepolicy with the same Change-Id
to define non-goldfish-specific types for properties and logcat.
Change-Id: Idce1fb5ed9680af84788ae69a5ace684c6663974
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-22 14:41:56 -04:00
Ying Wang
43928a00fb
am cccbcfe7
: (-s ours) am c5a99042
: Merge "Use "" to preserve argument word breaks"
...
* commit 'cccbcfe753d19b07eeef02c274d46ef987bedfbf':
Use "$@" to preserve argument word breaks
2014-09-22 17:08:49 +00:00
Ying Wang
cccbcfe753
am c5a99042
: Merge "Use "" to preserve argument word breaks"
...
* commit 'c5a99042e944787b2cd5f2e93ba4775ffd9e36fc':
Use "$@" to preserve argument word breaks
2014-09-22 16:50:14 +00:00
Ying Wang
c5a99042e9
Merge "Use "$@" to preserve argument word breaks"
2014-09-22 16:42:34 +00:00
Ying Wang
850ca0db5e
Use "$@" to preserve argument word breaks
...
This fixes mmma broken due to quotes stripped in the argument passing.
(cherry picked from commit dcc8b3729d
)
Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
2014-09-22 17:13:08 +02:00
Ying Wang
d0b1a55424
am 4cb0499a
: Allow LOCAL_ASSET_DIR point to nonexistent dir
...
* commit '4cb0499a5d6875fc13107f237779fb0422b4f7f2':
Allow LOCAL_ASSET_DIR point to nonexistent dir
2014-09-20 22:23:41 +00:00
Ying Wang
4cb0499a5d
Allow LOCAL_ASSET_DIR point to nonexistent dir
...
LOCAL_ASSET_DIR may point to a dir generated during the build process.
We have done similiar things to LOCAL_RESOURCE_DIR.
(cherry picked from commit bfcdf060ba
)
Bug: 16563899
Change-Id: Iaa72196e1e6350ae0720f8a4e0abc68d8d7ed642
2014-09-20 14:16:09 -07:00
Ying Wang
0379e9f83f
am a7ee956e
: am b69b7d7f
: Merge "Fix recovery image build for 32p"
...
* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
Fix recovery image build for 32p
2014-09-20 01:06:48 +00:00
Ying Wang
a7ee956e9d
am b69b7d7f
: Merge "Fix recovery image build for 32p"
...
* commit 'b69b7d7fba2a03faa1405da5bde9b6b559c758b2':
Fix recovery image build for 32p
2014-09-20 00:49:36 +00:00
Ying Wang
b69b7d7fba
Merge "Fix recovery image build for 32p"
2014-09-20 00:38:08 +00:00
Bill Yi
6d3f081e08
am e3386105
: Remove PinyinIME from target config
...
* commit 'e3386105e31971378386ef2fe8480aacfc082ea0':
Remove PinyinIME from target config
2014-09-20 00:02:19 +00:00
Bill Yi
6d057b69ef
am 5855c216
: (-s ours) am 70d3c707
: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"
...
* commit '5855c2161a6cd93fb62c6d2326d9e2f7517f7fa7':
Remove PinyinIME from target config - DO NOT MERGE
2014-09-20 00:02:15 +00:00
Bill Yi
5855c2161a
am 70d3c707
: (-s ours) Merge "Remove PinyinIME from target config - DO NOT MERGE"
...
* commit '70d3c707caa45968508d45c703b0edb13199b5ea':
Remove PinyinIME from target config - DO NOT MERGE
2014-09-19 23:46:29 +00:00
Bill Yi
70d3c707ca
Merge "Remove PinyinIME from target config - DO NOT MERGE"
2014-09-19 23:36:04 +00:00
Bill Yi
8b244b3f84
Remove PinyinIME from target config - DO NOT MERGE
...
BUG:17578207
2014-09-19 16:12:46 -07:00
Elliott Hughes
ae9c91b8b1
am a4a57339
: am e2f54706
: Merge "Remove unused HAVE_EPOLL."
...
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
Remove unused HAVE_EPOLL.
2014-09-19 23:11:08 +00:00
Bill Yi
e3386105e3
Remove PinyinIME from target config
...
BUG:17578207
2014-09-19 16:04:17 -07:00
Elliott Hughes
a4a57339f3
am e2f54706
: Merge "Remove unused HAVE_EPOLL."
...
* commit 'e2f547060678ed4199b9f398b95643e08e6b6959':
Remove unused HAVE_EPOLL.
2014-09-19 23:02:38 +00:00
Elliott Hughes
e2f5470606
Merge "Remove unused HAVE_EPOLL."
2014-09-19 22:54:17 +00:00
Elliott Hughes
67839a58be
Remove unused HAVE_EPOLL.
...
The only people who appear to be using this are actually using their own
one.
Change-Id: I349ed4ce3874c1b2f9bad56c93c8ccee88ae9432
2014-09-19 15:12:56 -07:00