OSDN Git Service
The Android Automerger [Mon, 16 Sep 2013 13:00:34 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 16 Sep 2013 02:47:46 +0000 (19:47 -0700)]
"KRS74J"
The Android Automerger [Sat, 14 Sep 2013 21:01:07 +0000 (14:01 -0700)]
"KRS74I"
The Android Automerger [Sat, 14 Sep 2013 04:58:44 +0000 (21:58 -0700)]
"KRS74H"
The Android Automerger [Sat, 14 Sep 2013 02:12:05 +0000 (19:12 -0700)]
"KRS74G"
Scott Main [Sat, 14 Sep 2013 01:00:16 +0000 (18:00 -0700)]
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
Scott Main [Sat, 14 Sep 2013 00:58:32 +0000 (17:58 -0700)]
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
Scott Main [Sat, 14 Sep 2013 00:55:54 +0000 (17:55 -0700)]
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
Scott Main [Thu, 12 Sep 2013 19:56:41 +0000 (12:56 -0700)]
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
The Android Automerger [Fri, 13 Sep 2013 20:50:28 +0000 (13:50 -0700)]
"KRS74F"
The Android Automerger [Fri, 13 Sep 2013 18:16:04 +0000 (11:16 -0700)]
"KRS74E"
The Android Automerger [Fri, 13 Sep 2013 02:20:34 +0000 (19:20 -0700)]
"KRS74D"
Ying Wang [Fri, 13 Sep 2013 00:35:21 +0000 (17:35 -0700)]
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
The Android Automerger [Fri, 13 Sep 2013 00:28:25 +0000 (17:28 -0700)]
KRS74C
The Android Automerger [Thu, 12 Sep 2013 22:07:38 +0000 (15:07 -0700)]
"KRS74B"
Scott Main [Thu, 12 Sep 2013 19:17:26 +0000 (12:17 -0700)]
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.
Scott Main [Thu, 12 Sep 2013 19:16:02 +0000 (12:16 -0700)]
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.
Scott Main [Thu, 12 Sep 2013 19:14:19 +0000 (19:14 +0000)]
Merge "Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in." into jb-mr2-ub-dev
Scott Main [Thu, 12 Sep 2013 18:45:05 +0000 (18:45 +0000)]
Revert "remove renderscript support lib from javadocs"
... put support lib javadocs for renderscript back in.
This reverts commit
5b743677eb4bb91af98b005651370885bdaae3e5.
Change-Id: Ia093b04e79ed35d18d9ced7b827a0b06ec4439c1
Torne (Richard Coles) [Thu, 12 Sep 2013 13:55:36 +0000 (14:55 +0100)]
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
The Android Automerger [Thu, 12 Sep 2013 13:03:16 +0000 (06:03 -0700)]
"KRS74"
The Android Automerger [Thu, 12 Sep 2013 13:00:47 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 11 Sep 2013 21:32:25 +0000 (14:32 -0700)]
"KRS73C"
Victoria Lease [Fri, 6 Sep 2013 21:00:38 +0000 (14:00 -0700)]
include external/sil-fonts
Bug:
10625246
Change-Id: I15c655030557e91663635b70848da86c9e0221e7
(cherry picked from commit
fd1327256e698a7b5dd677bea45947fd20b23208)
Scott Main [Wed, 11 Sep 2013 17:17:38 +0000 (10:17 -0700)]
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
Scott Main [Wed, 11 Sep 2013 17:15:04 +0000 (10:15 -0700)]
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
Scott Main [Wed, 11 Sep 2013 17:09:47 +0000 (10:09 -0700)]
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
The Android Automerger [Wed, 11 Sep 2013 15:30:17 +0000 (08:30 -0700)]
"KRS73B"
The Android Automerger [Wed, 11 Sep 2013 13:02:05 +0000 (06:02 -0700)]
"KRS73"
The Android Automerger [Wed, 11 Sep 2013 13:00:10 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 11 Sep 2013 00:12:46 +0000 (17:12 -0700)]
"KRS72B"
The Android Automerger [Tue, 10 Sep 2013 21:30:13 +0000 (14:30 -0700)]
"KRS72"
The Android Automerger [Tue, 10 Sep 2013 21:28:03 +0000 (14:28 -0700)]
merge in klp-release history after reset to klp-dev
Nick Kralevich [Tue, 10 Sep 2013 20:13:18 +0000 (20:13 +0000)]
Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
Nick Kralevich [Sun, 8 Sep 2013 00:10:29 +0000 (17:10 -0700)]
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
The Android Automerger [Tue, 10 Sep 2013 02:18:44 +0000 (19:18 -0700)]
KRS71D
Scott Main [Tue, 10 Sep 2013 01:51:49 +0000 (18:51 -0700)]
fix most of size problems of DAC on handsets.
set device-width for viewport tag
Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
The Android Automerger [Mon, 9 Sep 2013 23:00:30 +0000 (16:00 -0700)]
"KRS71C"
Ying Wang [Mon, 9 Sep 2013 19:11:02 +0000 (12:11 -0700)]
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
Ying Wang [Mon, 9 Sep 2013 18:35:42 +0000 (11:35 -0700)]
Delete dead code.
frameworks/policies/base/PolicyConfig.mk does no longer exist.
Change-Id: I34d4820bc7c1e19ac84095f5f2caf6aefdfe1bd3
The Android Automerger [Mon, 9 Sep 2013 14:59:36 +0000 (07:59 -0700)]
KRS71B
The Android Automerger [Mon, 9 Sep 2013 13:04:07 +0000 (06:04 -0700)]
"KRS71"
The Android Automerger [Mon, 9 Sep 2013 13:00:49 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 8 Sep 2013 05:12:16 +0000 (22:12 -0700)]
KRS67F
The Android Automerger [Fri, 6 Sep 2013 22:57:28 +0000 (15:57 -0700)]
"KRS67E"
The Android Automerger [Fri, 6 Sep 2013 19:37:07 +0000 (12:37 -0700)]
"KRS67D"
Dirk Dougherty [Fri, 6 Sep 2013 18:51:52 +0000 (11:51 -0700)]
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.
Dirk Dougherty [Fri, 6 Sep 2013 18:48:17 +0000 (11:48 -0700)]
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.
Dirk Dougherty [Fri, 6 Sep 2013 18:44:42 +0000 (11:44 -0700)]
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.
Dirk Dougherty [Fri, 6 Sep 2013 18:41:44 +0000 (18:41 +0000)]
Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
Eric Laurent [Fri, 6 Sep 2013 17:50:55 +0000 (17:50 +0000)]
Merge "add libeffectproxy for audio effects offloading" into klp-dev
The Android Automerger [Fri, 6 Sep 2013 17:48:47 +0000 (10:48 -0700)]
"KRS67C"
Eric Laurent [Fri, 6 Sep 2013 17:37:51 +0000 (10:37 -0700)]
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
Dirk Dougherty [Thu, 5 Sep 2013 00:54:49 +0000 (17:54 -0700)]
Build file breadcrumb from parentdirs keys, optionally linkify.
Change-Id: I7f4c9887d77c6d3ab1aca4e05963b6144a8b22f8
Scott Main [Fri, 6 Sep 2013 00:06:52 +0000 (17:06 -0700)]
am
76ff86cd: am
5d9690e3: am
4a9cc386: remove prev/next links from API guides
* commit '
76ff86cd32927899cd6a2913d4eeb920806d0ae6':
remove prev/next links from API guides
Scott Main [Fri, 6 Sep 2013 00:04:33 +0000 (17:04 -0700)]
am
5d9690e3: am
4a9cc386: remove prev/next links from API guides
* commit '
5d9690e376b27ede23c5f8b45e8689ffe30ef290':
remove prev/next links from API guides
Scott Main [Fri, 6 Sep 2013 00:01:13 +0000 (17:01 -0700)]
am
4a9cc386: remove prev/next links from API guides
* commit '
4a9cc3864a4fcb80522805bbef5052ff914311e3':
remove prev/next links from API guides
Scott Main [Thu, 5 Sep 2013 23:29:00 +0000 (16:29 -0700)]
remove prev/next links from API guides
Change-Id: Ic80ec436a6ee1c7decc3a6fc8905f52a1b50ea6a
The Android Automerger [Thu, 5 Sep 2013 22:44:03 +0000 (15:44 -0700)]
"KRS67B"
Kenny Root [Thu, 5 Sep 2013 22:10:44 +0000 (15:10 -0700)]
Add libcore.conscrypt tests back to CTS
A reorganization of the libcore test jar files caused the Conscrypt
tests to be accidentally dropped from CTS. Add them back in their own
package.
Bug:
10210673
Change-Id: Ia46a5de925c35115d25b7c0f974eba5b27bbfcd6
The Android Automerger [Thu, 5 Sep 2013 13:02:55 +0000 (06:02 -0700)]
"KRS67"
The Android Automerger [Thu, 5 Sep 2013 13:00:42 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Scott Main [Thu, 5 Sep 2013 04:21:30 +0000 (21:21 -0700)]
am
07540873: am
eb23299b: am
0ad622b4: add ellipsis for overflowing strings in samples nav
* commit '
07540873614ac13d1352ab30e25ea8f1aabc4035':
add ellipsis for overflowing strings in samples nav
Scott Main [Thu, 5 Sep 2013 04:19:39 +0000 (21:19 -0700)]
am
eb23299b: am
0ad622b4: add ellipsis for overflowing strings in samples nav
* commit '
eb23299bd55853135ebf3f8a99a0d0bcf1364b0a':
add ellipsis for overflowing strings in samples nav
Scott Main [Thu, 5 Sep 2013 04:17:35 +0000 (21:17 -0700)]
am
0ad622b4: add ellipsis for overflowing strings in samples nav
* commit '
0ad622b4a6fcaa4232b543aba3e28ec982b50d08':
add ellipsis for overflowing strings in samples nav
Scott Main [Thu, 5 Sep 2013 04:14:06 +0000 (21:14 -0700)]
add ellipsis for overflowing strings in samples nav
Change-Id: I1efcba409b068be0616eb2e3d80fadda301fd5f6
The Android Automerger [Wed, 4 Sep 2013 23:01:59 +0000 (16:01 -0700)]
"KRS66B"
The Android Automerger [Wed, 4 Sep 2013 13:02:49 +0000 (06:02 -0700)]
"KRS66"
The Android Automerger [Wed, 4 Sep 2013 13:00:30 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Santos Cordon [Tue, 3 Sep 2013 23:37:23 +0000 (16:37 -0700)]
Combining InCallUI & Dialer (part 2)
Removing InCallUI from generic product.
InCallUI code was built into Dialer so this APK is now redundant
bug:
10605332
Change-Id: Icfaf0b1975f2d6749c837f42ee309e17c9d08e23
Dirk Dougherty [Tue, 3 Sep 2013 22:25:08 +0000 (15:25 -0700)]
am
70892395: am
d55fb681: am
6fb7e23b: Add file path above h1 in samplecode files.
* commit '
70892395bb48ffca762a47c9bb35c1ad9c3512dc':
Add file path above h1 in samplecode files.
Dirk Dougherty [Tue, 3 Sep 2013 22:22:45 +0000 (15:22 -0700)]
am
d55fb681: am
6fb7e23b: Add file path above h1 in samplecode files.
* commit '
d55fb681d6766369e2dec734e22534fd43d9cc70':
Add file path above h1 in samplecode files.
Dirk Dougherty [Tue, 3 Sep 2013 22:20:43 +0000 (15:20 -0700)]
am
6fb7e23b: Add file path above h1 in samplecode files.
* commit '
6fb7e23bbaf07c5b89e885656d15efea07c527dc':
Add file path above h1 in samplecode files.
The Android Automerger [Tue, 3 Sep 2013 22:17:29 +0000 (15:17 -0700)]
"KRS65B"
The Android Automerger [Tue, 3 Sep 2013 13:00:46 +0000 (06:00 -0700)]
"KRS65"
The Android Automerger [Tue, 3 Sep 2013 13:00:07 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 2 Sep 2013 13:02:54 +0000 (06:02 -0700)]
"KRS64"
The Android Automerger [Mon, 2 Sep 2013 13:00:19 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 2 Sep 2013 09:32:54 +0000 (02:32 -0700)]
"KRS60H"
The Android Automerger [Sun, 1 Sep 2013 20:11:32 +0000 (13:11 -0700)]
"KRS60G"
Dirk Dougherty [Sat, 31 Aug 2013 02:06:57 +0000 (19:06 -0700)]
Add file path above h1 in samplecode files.
Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
The Android Automerger [Fri, 30 Aug 2013 22:06:11 +0000 (15:06 -0700)]
"KRS60F"
The Android Automerger [Fri, 30 Aug 2013 21:13:28 +0000 (14:13 -0700)]
"KRS60E"
The Android Automerger [Fri, 30 Aug 2013 18:22:50 +0000 (11:22 -0700)]
KRS60D
Torne (Richard Coles) [Fri, 30 Aug 2013 09:41:09 +0000 (09:41 +0000)]
Merge "Fix handling of .o files in LOCAL_GENERATED_SOURCES." into klp-dev
The Android Automerger [Thu, 29 Aug 2013 23:12:12 +0000 (16:12 -0700)]
"KRS60C"
The Android Automerger [Thu, 29 Aug 2013 21:29:55 +0000 (14:29 -0700)]
"KRS60B"
Jake Hamby [Thu, 29 Aug 2013 17:13:59 +0000 (10:13 -0700)]
Remove Moto OMA DM client from build tree.
Remove Moto OMA DM client from system image and intermediates.
Bug:
10455884
Change-Id: Idc0529d33911dc417f8f5b6db71808bf847eed3c
Torne (Richard Coles) [Thu, 29 Aug 2013 14:36:34 +0000 (15:36 +0100)]
Fix handling of .o files in LOCAL_GENERATED_SOURCES.
Rule-generated .o files (in gen_o_objects) were being given a dependency
on everything in LOCAL_GENERATED_SOURCES (except for other .o files);
unfortunately this can still create cycles in cases where there are
explicit dependencies between entries in LOCAL_GENERATED_SOURCES.
Instead, make handling of generated .o files consistent with other
generated files (which don't automatically get any dependencies on other
generated files) by excluding them from the target side of the rule.
Change-Id: I3fb5652dc3d85012c179a03b81887d16a85ab3bf
The Android Automerger [Thu, 29 Aug 2013 13:02:27 +0000 (06:02 -0700)]
"KRS60"
The Android Automerger [Thu, 29 Aug 2013 13:00:29 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Ying Wang [Thu, 29 Aug 2013 05:16:56 +0000 (22:16 -0700)]
am
cbea143e: am
019891c1: am
fc9cd4f5: Create an empty zip file if no dict file found.
* commit '
cbea143e94409ef941bbfb6c276d26199da46119':
Create an empty zip file if no dict file found.
Ying Wang [Thu, 29 Aug 2013 05:14:21 +0000 (22:14 -0700)]
am
019891c1: am
fc9cd4f5: Create an empty zip file if no dict file found.
* commit '
019891c1b858e571edd748e884b18d22d8efd10a':
Create an empty zip file if no dict file found.
Ying Wang [Thu, 29 Aug 2013 05:11:44 +0000 (22:11 -0700)]
am
fc9cd4f5: Create an empty zip file if no dict file found.
* commit '
fc9cd4f5c17eb51f09bb3fe14526894c7fa33ba6':
Create an empty zip file if no dict file found.
Ying Wang [Thu, 29 Aug 2013 01:38:25 +0000 (18:38 -0700)]
Create an empty zip file if no dict file found.
Instead of touch an empty file.
Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d
(cherry picked from commit
c62c92c3d737304cbd38e99e92f29e193b15b7c8)
Ying Wang [Thu, 29 Aug 2013 01:38:25 +0000 (18:38 -0700)]
Create an empty zip file if no dict file found.
Instead of touch an empty file.
Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d
The Android Automerger [Thu, 29 Aug 2013 00:31:24 +0000 (17:31 -0700)]
"KRS59B"
Ying Wang [Thu, 29 Aug 2013 00:28:36 +0000 (17:28 -0700)]
Skip compiling Java if an apk has no Java code.
Change-Id: Iee204e03ad5bc8ce5c3b4b3863c19c89184826e2
Ying Wang [Wed, 28 Aug 2013 20:04:46 +0000 (13:04 -0700)]
Better handle of need_compile_java.
Change-Id: I609a27e2b35b08962243b6516c6c525c0c938d3c
Ying Wang [Wed, 28 Aug 2013 18:16:06 +0000 (11:16 -0700)]
Make it a fatal error if no source files for Java module.
Change-Id: Ia04158c11381b6b1687b9d5c699a9ea8ae3cb317