Commit Graph

19886 Commits

Author SHA1 Message Date
Doug Zongker ead20e6a9a am 846cb3a9: add unit tests for rangelib
* commit '846cb3a9e628cb00088bf65a153c0fedc10f2621':
  add unit tests for rangelib
2014-09-26 14:53:59 +00:00
Doug Zongker 95dfa81664 am 62338188: generate version 2 blockimgdiff files
* commit '623381880a32a2912f95949a6c406038ac4e7064':
  generate version 2 blockimgdiff files
2014-09-26 14:53:58 +00:00
Brett Chabot 2e9683091a am fa63bb72: Merge "Remove cts dependency on ddmlib" into lmp-dev
* commit 'fa63bb72c980a12178bf7e150988a851619a1bd6':
  Remove cts dependency on ddmlib
2014-09-26 00:24:24 +00:00
Jeff Arneson 46b670c788 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-26 00:22:32 +00:00
Dianne Hackborn 8ae0f88b78 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-26 00:22:31 +00:00
Doug Zongker 846cb3a9e6 add unit tests for rangelib
Change-Id: I3b77e849007259e697da56bd493ae5b553b901d1
2014-09-25 16:39:32 -07:00
Doug Zongker 623381880a generate version 2 blockimgdiff files
Generate version 2 of the block_image_update transfer list format.
This improves patch size by a different strategy for dealing with
out-of-order transfers.  If transfer A must be done before transfer B
due to B overwriting A's source but we want to do B before A, we
resolve the conflict by:

  - before B is executed, we save ("stash") the overlapping region (ie
    the blocks B will overwrite that A wants to read)

  - when A is executed, it will read those parts of source data from
    the stash rather than from the image.

This reverses the ordering constraint; with these additions now B
*must* go before A.  The implementation of the stash is left up to the
code that executes the transfer list to apply the patch; it could hold
stashed data in RAM or on a scratch disk such as /cache, if available.

The code retains the ability to build a version 1 block image patch;
it's needed for processing older target-files.

Change-Id: Ia9aa0bd45d5dc3ef7c5835e483b1b2ead10135fe
2014-09-25 16:39:14 -07: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 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 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
Ying Wang e9ee28b27c am a47420a2: Break package-modules build recipe to mutliple lines
* commit 'a47420a22d83fb5707cb971d98961f87e667ffe8':
  Break package-modules build recipe to mutliple lines
2014-09-24 18:17:02 +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 b43af8807f resolved conflicts for merge of 326f9450 to lmp-mr1-dev-plus-aosp
Change-Id: I10e578a3d10a03312cbc4058a92f02ccaba1739c
2014-09-24 09:51:05 -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 c679451484 am 31f21208: am cb0755f8: Merge "Remove unused HAVE_OFF64_T."
* commit '31f2120848d2dcbbe3f2571ce9993d3dabff490f':
  Remove unused HAVE_OFF64_T.
2014-09-23 21:37:19 +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 c1dd3578a7 am 5d76f9e8: am 88c7544e: Merge "Remove the unused IPC macros."
* commit '5d76f9e8c87ac48b2ff6cceb13cb438c8e6d7064':
  Remove the unused IPC macros.
2014-09-23 16:17:33 +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 ff9fd2c3ed am 50bd6b99: am c65d93f6: Merge "build: remove HAVE_OOM_ADJ"
* commit '50bd6b99796e1ec8d688e5867bfe487d50e21372':
  build: remove HAVE_OOM_ADJ
2014-09-23 02:07:01 +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
Ying Wang 999a866f4d 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:47 +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 b393194d5b am 4cb0499a: Allow LOCAL_ASSET_DIR point to nonexistent dir
* commit '4cb0499a5d6875fc13107f237779fb0422b4f7f2':
  Allow LOCAL_ASSET_DIR point to nonexistent dir
2014-09-20 22:50:18 +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 b4c837672f am a7ee956e: am b69b7d7f: Merge "Fix recovery image build for 32p"
* commit 'a7ee956e9dc20fa5a01606b473b18b0c3980762f':
  Fix recovery image build for 32p
2014-09-20 03:01:28 +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 4f61040da1 am e3386105: Remove PinyinIME from target config
* commit 'e3386105e31971378386ef2fe8480aacfc082ea0':
  Remove PinyinIME from target config
2014-09-20 00:27:48 +00:00
Bill Yi ee6d0da3e7 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:01:51 +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
Elliott Hughes 6666562c27 am a4a57339: am e2f54706: Merge "Remove unused HAVE_EPOLL."
* commit 'a4a57339f3de18ee3fef962fea925962a49b26a3':
  Remove unused HAVE_EPOLL.
2014-09-19 23:17:04 +00:00
Bill Yi 8b244b3f84 Remove PinyinIME from target config - DO NOT MERGE
BUG:17578207
2014-09-19 16:12:46 -07: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
Brian Carlstrom da51aa7a13 am 8c444b61: am b97b1e59: Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
* commit '8c444b61b3d3fab99f9bd617a8d7705c81e8da7a':
  Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug
2014-09-19 22:01:42 +00:00