Commit graph

14217 commits

Author SHA1 Message Date
The Android Automerger
b5f95b9cf1 "KRS74G" 2013-09-13 19:12:05 -07:00
Scott Main
b753044259 am a18b429f: am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit 'a18b429fd3792b7c3fad2e0682aa39990b332c98':
  update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:00:16 -07:00
Scott Main
a18b429fd3 am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit 'fe340fac5aa08c9bbba6ce22521a10fce1b811f8':
  update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 17:58:32 -07:00
Scott Main
fe340fac5a am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
* commit 'e624b3fa474283e0c8d869b9d1754f001e83e349':
  update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 17:55:54 -07:00
Scott Main
e624b3fa47 update the init_google_navtree2 method to handle new format for sample nav tree data.
and update highlighting logic to handle hashtags

Change-Id: I77de8faaaeed12317aa83086df8273648a1ff00a
2013-09-13 17:04:39 -07:00
The Android Automerger
26302b6128 "KRS74F" 2013-09-13 13:50:28 -07:00
The Android Automerger
b65d0e9c51 "KRS74E" 2013-09-13 11:16:04 -07:00
The Android Automerger
c8658f94b4 "KRS74D" 2013-09-12 19:20:34 -07:00
Ying Wang
3057adbace Drop the [no]proguard. prefix for the intermediate targets
Since we have enabled Progaurd for all build variants, we don't need the
different naming scheme along the path to make incremental build work
properly when you switch build variant.
As a result, this fixes the nothing-to-do-do-build-gets-something-build bug
introduced by the multi-dex change.

Change-Id: I907ff13091013d28910b0aa190b9218144385132
2013-09-12 17:50:11 -07:00
The Android Automerger
bb3ce28598 KRS74C 2013-09-12 17:28:25 -07:00
The Android Automerger
7271bda354 "KRS74B" 2013-09-12 15:07:38 -07:00
Scott Main
3938f3e1af am 7cba6168: am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '7cba6168c3cf7681e6200f78bfbf8deacc2f735c':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:17:26 -07:00
Scott Main
7cba6168c3 am 9a3fb871: Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
* commit '9a3fb8711f93751ba3e709f4e99691147e6c2c93':
  Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
2013-09-12 12:16:02 -07:00
Scott Main
9a3fb8711f Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev 2013-09-12 19:14:19 +00:00
Scott Main
27597c4d8e Revert "remove renderscript support lib from javadocs"
... put support lib javadocs for renderscript back in.

This reverts commit 5b743677eb.

Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
2013-09-12 18:45:05 +00:00
Torne (Richard Coles)
5839c0f23d Remove libchromium_net from the base product.
The Chromium network stack is only needed by libwebcore and stagefright,
both of which already explicitly depend on it, so there's no need for it
to be in the base package list.

Bug: 10427705
Change-Id: Ifbb089de867c577788c6310571337c39c4ce31e0
2013-09-12 14:55:36 +01:00
The Android Automerger
53ab370d93 "KRS74" 2013-09-12 06:03:16 -07:00
The Android Automerger
f5927fb8e6 merge in klp-release history after reset to klp-dev 2013-09-12 06:00:47 -07:00
The Android Automerger
82074986fa "KRS73C" 2013-09-11 14:32:25 -07:00
Victoria Lease
65202c593d include external/sil-fonts
Bug: 10625246
Change-Id: I15c655030557e91663635b70848da86c9e0221e7
(cherry picked from commit fd1327256e)
2013-09-11 18:01:30 +00:00
Scott Main
d9fa558056 am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit '0c2b69d5b82062ecdef39297ddc7f7d86d038ad8':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:17:38 -07:00
Scott Main
0c2b69d5b8 am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit 'd6125b5e2ff71988009bc0fd86a32876e9a6981f':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:15:04 -07:00
Scott Main
d6125b5e2f am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
* commit '2552239a522963429f494ff89a4be6d3831fb1fb':
  fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:09:47 -07:00
The Android Automerger
0eb1509435 "KRS73B" 2013-09-11 08:30:17 -07:00
The Android Automerger
3cddaa4340 "KRS73" 2013-09-11 06:02:05 -07:00
The Android Automerger
1254c070f0 merge in klp-release history after reset to klp-dev 2013-09-11 06:00:10 -07:00
The Android Automerger
250242cae7 "KRS72B" 2013-09-10 17:12:46 -07:00
The Android Automerger
5ad83b7e21 "KRS72" 2013-09-10 14:30:13 -07:00
The Android Automerger
2fa1628a7b merge in klp-release history after reset to klp-dev 2013-09-10 14:28:03 -07:00
Nick Kralevich
b5d4c0df50 Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev 2013-09-10 20:13:18 +00:00
Nick Kralevich
0eb17d9447 Update OTA to understand SELinux labels and capabilities
Update the OTA generation script to understand SELinux file
labels and file capabilities.

Make fs_config aware of SELinux labels and file capabilities, and
optionally output those elements whenever we output the
UID / GID / file perms. The information is emitted as a key=value pair
to allow for future extensibility.

Pass the SELinux file label and capabilities to the newly created
set_metadata() and set_metadata_recursive() calls. When the OTA
script fixes up filesystem permissions, it will also fix up the SELinux
labels and file capabilities.

If no SELinux label and capabilities are available for the file, use
the old set_perm and set_perm_recursive calls.

Bug: 8985290
Bug: 10183961
Bug: 10186213
Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
2013-09-10 12:30:43 -07:00
The Android Automerger
4449eb82da KRS71D 2013-09-09 19:18:44 -07:00
Scott Main
2552239a52 fix most of size problems of DAC on handsets.
set device-width for viewport tag

Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
2013-09-09 18:51:49 -07:00
The Android Automerger
59331f6a15 "KRS71C" 2013-09-09 16:00:30 -07:00
Ying Wang
20ef354e8c Load the ONE_SHOT_MAKEFILE even in dont_bother mode
This makes "mmm <path> snod" work again.
Note that snod has dependency on the rest of the command line goals,
which is all_modules for ONE_SHOT_MAKEFILE,
so build race condition is avoided.

Change-Id: Ib0c0e622530cde773180a095e5ec4dde1149b8e5
2013-09-09 12:13:25 -07:00
Ying Wang
39e08f2827 Delete dead code.
frameworks/policies/base/PolicyConfig.mk does no longer exist.

Change-Id: I34d4820bc7c1e19ac84095f5f2caf6aefdfe1bd3
2013-09-09 11:35:42 -07:00
The Android Automerger
7a9a9680f4 KRS71B 2013-09-09 07:59:36 -07:00
The Android Automerger
a15b40ac92 "KRS71" 2013-09-09 06:04:07 -07:00
The Android Automerger
4d36b74317 merge in klp-release history after reset to klp-dev 2013-09-09 06:00:49 -07:00
The Android Automerger
684def3409 KRS67F 2013-09-07 22:12:16 -07:00
The Android Automerger
098982dbda "KRS67E" 2013-09-06 15:57:28 -07:00
The Android Automerger
b51a1d72a2 "KRS67D" 2013-09-06 12:37:07 -07:00
Dirk Dougherty
00fcdfede6 am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '0b345f589691a774d04a698e80412c531c726f6c':
  Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 11:51:52 -07:00
Dirk Dougherty
0b345f5896 am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '471f0cc84adbb666e4d0e2529feb326df6d3baa3':
  Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 11:48:17 -07:00
Dirk Dougherty
471f0cc84a am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
* commit '243ffc5bc2f26041b440ad107c1725913c73765a':
  Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 11:44:42 -07:00
Dirk Dougherty
243ffc5bc2 Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs 2013-09-06 18:41:44 +00:00
Eric Laurent
7e258f1106 Merge "add libeffectproxy for audio effects offloading" into klp-dev 2013-09-06 17:50:55 +00:00
The Android Automerger
6b46ab40e9 "KRS67C" 2013-09-06 10:48:47 -07:00
Eric Laurent
aaa85b948e add libeffectproxy for audio effects offloading
libeffectproxy is used when offloading audio effects to
a DSP. It is a framework component working with the audio
effects factory in libeffects that must be present on all
products.

Bug: 8174034.
Change-Id: I5035884735a370e9fe87467a45efbf24ba190886
2013-09-06 10:46:05 -07:00
Dirk Dougherty
f2bd4eb26a Build file breadcrumb from parentdirs keys, optionally linkify.
Change-Id: I7f4c9887d77c6d3ab1aca4e05963b6144a8b22f8
2013-09-05 19:17:04 -07:00