OSDN Git Service
Scott Main [Mon, 16 Sep 2013 18:05:17 +0000 (11:05 -0700)]
am
8b4e768f: am
013bf8c8: am
e48657b2: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
* commit '
8b4e768ffd159772ed064a948433028f1e39a386':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Scott Main [Mon, 16 Sep 2013 18:03:15 +0000 (11:03 -0700)]
am
013bf8c8: am
e48657b2: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
* commit '
013bf8c8c46b844eb58e376b3a45ecfa4f5f4763':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
Scott Main [Mon, 16 Sep 2013 18:01:54 +0000 (11:01 -0700)]
am
e48657b2: Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
* commit '
e48657b2aeac15b522e5ba60e4719844e2d8183f':
Revert "remove renderscript support lib from javadocs" ... put support lib javadocs for renderscript back in.
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
(cherry picked from commit
27597c4d8ee7623152bf908b05eed6b869987c14)
Jeff Sharkey [Mon, 16 Sep 2013 17:37:36 +0000 (10:37 -0700)]
Remove Terminal for now.
Bug:
10780928
Change-Id: Iab3991e8d7df7d29e108e389ea18702c5e7efa25
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
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
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
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
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
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
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
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
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
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
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
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.
Dirk Dougherty [Sat, 31 Aug 2013 02:06:57 +0000 (19:06 -0700)]
Add file path above h1 in samplecode files.
Change-Id: I91adb197b478ea476bbf0e07650486581c1ca8ec
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
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
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
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
Clay Murphy [Wed, 28 Aug 2013 15:56:35 +0000 (15:56 +0000)]
Merge "Docs: Fixing link from logo in PDK Bug:
9177537 Staging location: claym.mtv.corp.google.com:8083/guide/getting_started.html" into klp-dev
Clay Murphy [Tue, 27 Aug 2013 23:04:35 +0000 (16:04 -0700)]
Docs: Fixing link from logo in PDK
Bug:
9177537
Staging location:
http://claym.mtv.corp.google.com:8083/guide/getting_started.html
Change-Id: I4c4708a168688fdfc79468b955115d7f37df1bc2
Mathias Agopian [Tue, 27 Aug 2013 22:09:01 +0000 (22:09 +0000)]
Merge "fix uses of grep in envsetup.h" into klp-dev
Ying Wang [Tue, 27 Aug 2013 22:04:57 +0000 (15:04 -0700)]
In apps_only build dist a module only if it has a BUILT file.
This allows you to specify a PHONY target in TARGET_BUILD_APPS.
Change-Id: Idd813cd0dbdb14c705fbd3187596d4c64b99d045
Mathias Agopian [Tue, 27 Aug 2013 21:15:50 +0000 (14:15 -0700)]
fix uses of grep in envsetup.h
make sure we don't use a grep alias if one exists.
Change-Id: Id8e394f5889d9a5f1d320ecb289c974da8f14207
Ying Wang [Mon, 26 Aug 2013 21:57:52 +0000 (14:57 -0700)]
Remove the vendor-specific vars from the protected list.
Change-Id: I915a61034c9c3e2b886f609c4b8f4043e97bda61
Dirk Dougherty [Mon, 26 Aug 2013 18:56:37 +0000 (11:56 -0700)]
am
13ab927a: am
2747bec3: am
981effcc: Add breadcrumb for sample code html pages.
* commit '
13ab927a81256c8cb03bcbd31344ae979ab78617':
Add breadcrumb for sample code html pages.
Dirk Dougherty [Mon, 26 Aug 2013 18:54:33 +0000 (11:54 -0700)]
am
2747bec3: am
981effcc: Add breadcrumb for sample code html pages.
* commit '
2747bec31735e212a345865b4cb42dfc2bae7800':
Add breadcrumb for sample code html pages.
Dirk Dougherty [Mon, 26 Aug 2013 18:52:05 +0000 (11:52 -0700)]
am
981effcc: Add breadcrumb for sample code html pages.
* commit '
981effcc96fd7ea0b6b03546701e56dff52500d0':
Add breadcrumb for sample code html pages.
Dirk Dougherty [Fri, 23 Aug 2013 04:26:54 +0000 (21:26 -0700)]
Add breadcrumb for sample code html pages.
Change-Id: Iaec2e2686ce2fba4169f0d2ee80c122c6ae55bee
Ying Wang [Fri, 23 Aug 2013 03:02:03 +0000 (20:02 -0700)]
Collect NOTICE files for apps_only build.
In apps_only build (after running tapas or exporting TARGET_BUILD_APPS),
run "make notice_files" to collect and combine the NOTICE files of
modules that are needed by the apps.
Bug:
10445634
Change-Id: I6555bba1104e43b48c723c82143c46d444a75e80
Ying Wang [Fri, 23 Aug 2013 19:19:48 +0000 (12:19 -0700)]
am
b88ca53a: am
ddce2eb0: am
de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
b88ca53a465ef004a60ceb9c4c641c3c997edeb5':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 19:18:11 +0000 (12:18 -0700)]
am
ddce2eb0: am
de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
ddce2eb007c97b8ca94bc7b3190a83006df0c187':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 19:16:16 +0000 (12:16 -0700)]
am
de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
de32713f47b33c6d4c0bb4c8943e1eccf81aa0c5':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 19:14:20 +0000 (19:14 +0000)]
Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
Ying Wang [Fri, 23 Aug 2013 03:52:47 +0000 (20:52 -0700)]
Collect and store proguard obfuscation dictionary files.
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.
Bug:
9407666
Change-Id: I51c78bf0f42f959dc920de230e60e0f71ed0d0ea
Ying Wang [Fri, 23 Aug 2013 19:10:20 +0000 (12:10 -0700)]
am
29695daa: am
653a037d: am
638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '
29695daa9734a8dfb516b7ff2e35b2b263e6b37b':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
Ying Wang [Fri, 23 Aug 2013 19:07:45 +0000 (12:07 -0700)]
am
653a037d: am
638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '
653a037d70d770d2fc03d4f205a9c626af5f5c76':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
Ying Wang [Fri, 23 Aug 2013 19:03:47 +0000 (12:03 -0700)]
am
638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '
638ce57a5848c10d781502bf198a2b93aeb58a7a':
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
Ying Wang [Fri, 23 Aug 2013 18:59:49 +0000 (11:59 -0700)]
Treat LOCAL_APK_LIBRARIES like shared Java libraries.
This fix proguard build.
Bug:
10307372
Change-Id: Id99d6e903077b4bacdea2e68cbb78e46a4a6afb8
Ying Wang [Fri, 23 Aug 2013 17:17:47 +0000 (10:17 -0700)]
am
2363485c: am
06de9f94: am
8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '
2363485c2fb3f08d36e8cdbb2240b9c3993b470c':
Revert "Collect and store proguard obfuscation dictionary files."
Ying Wang [Fri, 23 Aug 2013 17:14:48 +0000 (10:14 -0700)]
am
06de9f94: am
8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '
06de9f940c34b8ade1f1866fbc1c6b32f93277b4':
Revert "Collect and store proguard obfuscation dictionary files."
Ying Wang [Fri, 23 Aug 2013 17:13:19 +0000 (10:13 -0700)]
am
8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '
8709497ed82800f399e99516df59afdb1bae8472':
Revert "Collect and store proguard obfuscation dictionary files."
Ying Wang [Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)]
am
93b95dc4: am
aa87a11d: am
afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
93b95dc4b9f9b4e04e8a0fac25c958d5c52266e4':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 17:12:26 +0000 (10:12 -0700)]
am
ec3c15e5: am
04c4d34d: am
7311a344: Make it easier to enable obfuscation and optimization.
* commit '
ec3c15e5c7c11cf3a831898f286c7eb7c216e50f':
Make it easier to enable obfuscation and optimization.
Ying Wang [Fri, 23 Aug 2013 17:11:29 +0000 (17:11 +0000)]
Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
Ying Wang [Fri, 23 Aug 2013 17:11:18 +0000 (17:11 +0000)]
Revert "Collect and store proguard obfuscation dictionary files."
This reverts commit
41dbe1e535c1aea9a4c4cec6be637fe1b882220b.
Change-Id: I023594779128083b75a069fd860cd29dd7951ef5
Ying Wang [Fri, 23 Aug 2013 17:09:28 +0000 (10:09 -0700)]
am
aa87a11d: am
afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
aa87a11dffec0ea58c93ab0dd23b067975a4c681':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 17:09:27 +0000 (10:09 -0700)]
am
04c4d34d: am
7311a344: Make it easier to enable obfuscation and optimization.
* commit '
04c4d34d4fdb56c824abf39239d2c87806706b7e':
Make it easier to enable obfuscation and optimization.
Ying Wang [Fri, 23 Aug 2013 17:06:59 +0000 (10:06 -0700)]
am
afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
afd7457adf844692b5de8f8d7eefedcc10dc7da1':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 17:06:58 +0000 (10:06 -0700)]
am
7311a344: Make it easier to enable obfuscation and optimization.
* commit '
7311a344bed507062e781ba70331d85652c217d8':
Make it easier to enable obfuscation and optimization.
Ying Wang [Fri, 23 Aug 2013 17:05:31 +0000 (17:05 +0000)]
Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
Ying Wang [Fri, 23 Aug 2013 03:52:47 +0000 (20:52 -0700)]
Collect and store proguard obfuscation dictionary files.
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.
Bug:
9407666
Change-Id: I0324eed6bb236abb0d3725f8d2a0b6c5c31935fe
Jeff Brown [Fri, 23 Aug 2013 01:37:11 +0000 (18:37 -0700)]
Remove input flinger stubs. (DO NOT MERGE)
Bug:
10446930
Change-Id: Ifea564dce9b7b2f8a792dde4119316211febfd59
Ying Wang [Thu, 22 Aug 2013 01:32:49 +0000 (18:32 -0700)]
Make it easier to enable obfuscation and optimization.
With this change, use:
* LOCAL_PROGUARD_ENABLED := obfuscation # to enable obfuscation
* LOCAL_PROGUARD_ENABLED := optimization # to enable optimization
* LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both
Now the meaning of the LOCAL_PROGUARD_ENABLED options:
* full:
Use the build system's default configurations:
with shrink but no obfuscation or optimization,
global proguard flags in build/core/proguard.flags
are applied.
* custom:
The same as "full" except no aapt-generated resource-related
proguard flags.
* nosystem:
Don't use any build system's default configurations; but
aapt-generated proguard flags are still applied. You are
responsible for any other flags.
* disabled:
Disable proguard.
* obfuscation:
The same as "full" but with obfuscation enabled.
* optimization:
The same as "full" but with optimization enabled.
* no value (the default):
The build system chooses the proper value: "full" if it's an
app; "disabled" if it's a library.
You can use more than 1 of them in a meaningful combination,
for example:
LOCAL_PROGUARD_ENABLED := obfuscation optimization
Bug:
10307372
Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
Scott Main [Thu, 22 Aug 2013 23:39:35 +0000 (16:39 -0700)]
am
504dbfc3: am
fc8140d3: am
d4645ea9: remove project structure from sample landing pages
* commit '
504dbfc3b984e3e7981acba8f0b6e65348838bcd':
remove project structure from sample landing pages
Scott Main [Thu, 22 Aug 2013 23:37:41 +0000 (16:37 -0700)]
am
fc8140d3: am
d4645ea9: remove project structure from sample landing pages
* commit '
fc8140d32afaef4e7af2a76480452aa3ca0009cc':
remove project structure from sample landing pages
Scott Main [Thu, 22 Aug 2013 23:36:20 +0000 (16:36 -0700)]
am
d4645ea9: remove project structure from sample landing pages
* commit '
d4645ea9d483525175d3d65e7ca90d018f9aa8e9':
remove project structure from sample landing pages
Scott Main [Thu, 22 Aug 2013 23:32:12 +0000 (16:32 -0700)]
am
c120c3fe: am
1ef0d363: am
285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs
* commit '
c120c3fecb193835d56beec245913111f2fc8e41':
clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
Scott Main [Thu, 22 Aug 2013 23:32:12 +0000 (16:32 -0700)]
am
f1d5a3b1: am
2b9846d9: am
f0093857: fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
* commit '
f1d5a3b117ca827c26d901875ac69e2fde0fb106':
fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
Scott Main [Thu, 22 Aug 2013 23:25:15 +0000 (16:25 -0700)]
remove project structure from sample landing pages
Change-Id: I646aa996ce518421567c09bbb3a0cd8b4875d530
Scott Main [Thu, 22 Aug 2013 23:28:13 +0000 (16:28 -0700)]
am
1ef0d363: am
285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs
* commit '
1ef0d36382388e51d011d2dd481d11750a4a858a':
clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav
Scott Main [Thu, 22 Aug 2013 23:28:13 +0000 (16:28 -0700)]
am
2b9846d9: am
f0093857: fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
* commit '
2b9846d9d1c075068d192f75f73f44896c95b7db':
fix a couple bugs in sidenav for samples. Previously, clicking a link still invoked the expand collapse behavior. Previously, collapsing a parent item did not also collapse its children.
Scott Main [Thu, 22 Aug 2013 23:23:48 +0000 (16:23 -0700)]
am
285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs
* commit '
285f07722d86f422166811ffc810535a97c1eb1e':
clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav