OSDN Git Service
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
Scott Main [Thu, 22 Aug 2013 23:23:47 +0000 (16:23 -0700)]
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 '
f009385738c8201e8a964a567acb59ee14fc2116':
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:22:09 +0000 (23:22 +0000)]
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
Scott Main [Thu, 22 Aug 2013 23:03:21 +0000 (16:03 -0700)]
clean up the sample template files to remove unused stuff
and fix the collapsible project list
and highlight the Samples nav
Change-Id: I8baf5874ae709c914aae47ffb04fc8e0b84e8dea
Scott Main [Thu, 22 Aug 2013 18:37:11 +0000 (11:37 -0700)]
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.
Change-Id: Iac0b9208bfbab79e9715850f9a192c22250d0673
Scott Main [Thu, 22 Aug 2013 00:44:52 +0000 (17:44 -0700)]
am
fa704681: am
a320b99a: am
498d710a: modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-
* commit '
fa704681f9109eb25e19ab4eeb53636e92501c55':
modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. Also includes script for features like single-click to highlight a line of code and double-click to invoke the link for that line.
Scott Main [Wed, 21 Aug 2013 23:31:52 +0000 (16:31 -0700)]
am
a320b99a: am
498d710a: modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. A
* commit '
a320b99a2db0f038c122a3ab712adf231b99f380':
modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. Also includes script for features like single-click to highlight a line of code and double-click to invoke the link for that line.
Scott Main [Wed, 21 Aug 2013 23:28:57 +0000 (16:28 -0700)]
am
498d710a: modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. Also includes
* commit '
498d710a4f66ec8b6fff4c965235f226b56cd2dd':
modify sample template and add new css/script for new numbered code. The line numbers are included inside the <pre> block initially, but hidden, so this script moves the numbers to a separate block on the left and makes them non-selectable. Also includes script for features like single-click to highlight a line of code and double-click to invoke the link for that line.
Scott Main [Wed, 21 Aug 2013 22:47:38 +0000 (15:47 -0700)]
modify sample template and add new css/script for new numbered code.
The line numbers are included inside the <pre> block initially, but
hidden, so this script moves the numbers to a separate block on
the left and makes them non-selectable. Also includes script for
features like single-click to highlight a line of code and double-click
to invoke the link for that line.
Change-Id: I17ebb1255ff036948028b4722cc8e9758fb96553
Baligh Uddin [Wed, 21 Aug 2013 19:44:02 +0000 (12:44 -0700)]
Add New languages.
Bug:
10246852
Mathew Inwood [Wed, 21 Aug 2013 10:13:18 +0000 (11:13 +0100)]
Remove ApplicationsProvider.
ApplicationsProvider is going away since it's no longer needed. Remove it
from the build config.
Also add cleansteps to remove the APK & intermediates.
Bug:
10407790
Change-Id: I0b273d22e309822fde6d753b541f7ac648607b4e
Jeff Brown [Wed, 21 Aug 2013 00:29:46 +0000 (00:29 +0000)]
Merge "Enhance 'stacks' script to handle native processes." into klp-dev
Scott Main [Wed, 21 Aug 2013 00:28:14 +0000 (17:28 -0700)]
am
feb45280: am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
feb45280aa67e4fd7280d15caae3673b82895624':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Wed, 21 Aug 2013 00:24:01 +0000 (17:24 -0700)]
am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
8088dd2f83ae17a1343de87750d39f8264d7b7bc':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Wed, 21 Aug 2013 00:21:31 +0000 (17:21 -0700)]
am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
ad08f07cf2ece7a3711eafa382cf741134c69083':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Tue, 20 Aug 2013 23:49:57 +0000 (16:49 -0700)]
new version of script to build sidenav lists dynamically.
This is currently used only by the samples nav, but we'll
later update to handle the Google reference nav as well
Change-Id: I907ea8cb096148ba50808623ed872c8defc9a135
Jason Monk [Tue, 20 Aug 2013 23:36:44 +0000 (23:36 +0000)]
Merge "Remove old PAC dependency and add new one." into klp-dev
Jeff Brown [Mon, 19 Aug 2013 22:14:16 +0000 (15:14 -0700)]
Enhance 'stacks' script to handle native processes.
Automatically detects whether the process is native or managed
and dumps the stacks accordingly.
Change-Id: Ifba65279f1d1b9714b66aa6990bab05575871d28
Dirk Dougherty [Mon, 19 Aug 2013 22:02:50 +0000 (15:02 -0700)]
am
337ebc19: am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
337ebc195ff7ebb4f12b9012ccfc9f89a8a66570':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 22:00:39 +0000 (15:00 -0700)]
am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
62c755a52a74dc2f887d51d48105eebff17a6346':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 21:57:19 +0000 (14:57 -0700)]
am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
f5ffd4a40c7a2165ff6ebe24a2aa189dea6b1806':
Clean up core css changes brought in with samples css.
Jason Monk [Mon, 19 Aug 2013 19:42:32 +0000 (15:42 -0400)]
Remove old PAC dependency and add new one.
PAC support has been changed from a standalone executable to an apk
that needs to be part of the build. This removes the old depency
and adds the new one.
Bug:
10182711
Change-Id: I1291f54d81e6ec0c775e045a3446bd0cffb40019
Dirk Dougherty [Mon, 19 Aug 2013 19:26:07 +0000 (12:26 -0700)]
Clean up core css changes brought in with samples css.
Change-Id: I0920695be4f6ed7085508a4451c13bc7d9e65d9a
Dirk Dougherty [Mon, 19 Aug 2013 19:14:19 +0000 (12:14 -0700)]
am
6d244fb2: am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
6d244fb2ed0abdf843c33fca3a2ba2557ac921aa':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:12:07 +0000 (12:12 -0700)]
am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
d5ac833061b2233b71a60155656ca97cd5494746':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:09:46 +0000 (12:09 -0700)]
am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
4f7e5159409e71ecfeba86858f5ec044d043aff8':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Thu, 16 Sep 2010 17:43:40 +0000 (10:43 -0700)]
doc change: Samples browsing: basic support in templates and js/css.
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
Ying Wang [Fri, 16 Aug 2013 20:24:47 +0000 (13:24 -0700)]
Add phony goal GET-INSTALL-PATH
It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.
Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
Scott Main [Thu, 15 Aug 2013 21:51:37 +0000 (14:51 -0700)]
am
ce478d54: am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the referen
* commit '
ce478d54ad619c11b796b6286357c3203544d90d':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:45:35 +0000 (14:45 -0700)]
am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar w
* commit '
7e453280539406882215a0602ae6f63d7585fb9f':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:43:45 +0000 (14:43 -0700)]
am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appe
* commit '
52dd206715e9d8e80a22c7106ec783324d51e747':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Ying Wang [Thu, 15 Aug 2013 21:34:09 +0000 (14:34 -0700)]
am
fc8b6338: resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
* commit '
fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
No need to filter out AndroidConfig.h for unbundled build
Scott Main [Thu, 15 Aug 2013 19:22:28 +0000 (12:22 -0700)]
fix two bugs in site script.
1. Fix URL path check for reference docs to initalize api level and sidenav.
Previously, this condition was never true, so the sidenav would not be initialized
under default conditions and the reference drag bar would not appear.
2. Fix the recent change to the 'scroll into view' script so that it works
properly in a multi-pane sidenav (reference docs) by again making the offset
measurement relative to the parent container (but much better than was done before).
Change-Id: I2a31ed59d772346651c2432f0ed26530983c49ff
Ying Wang [Thu, 15 Aug 2013 19:02:30 +0000 (12:02 -0700)]
resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
Ying Wang [Thu, 15 Aug 2013 18:55:46 +0000 (11:55 -0700)]
am
f4723fa4: No need to filter out AndroidConfig.h for unbundled build
* commit '
f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
No need to filter out AndroidConfig.h for unbundled build
Ying Wang [Thu, 15 Aug 2013 18:01:10 +0000 (11:01 -0700)]
No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
Vineeta Srivastava [Wed, 14 Aug 2013 20:28:06 +0000 (13:28 -0700)]
Fix missing camera from aosp builds.
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.
Bug:
10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
The Android Open Source Project [Wed, 14 Aug 2013 19:16:12 +0000 (12:16 -0700)]
am
fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
fb2188d1390841285181256a0ec37c5558c971da':
"JWR66Y"
The Android Open Source Project [Wed, 14 Aug 2013 19:06:41 +0000 (12:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b
Ying Wang [Wed, 14 Aug 2013 16:28:18 +0000 (09:28 -0700)]
am
396fd67d: am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
396fd67d7a691a1226783f1b15442af86137eb3d':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:26:06 +0000 (09:26 -0700)]
am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
b9eee184f2ab291f5af6520c41f90a8857c4bd73':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:22:01 +0000 (09:22 -0700)]
am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
e391e7a86e806bd3d2549b6d12736166fafb746f':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 00:40:24 +0000 (17:40 -0700)]
Remove -allowaccessmodification from the basic Proguard flags
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug:
10307364
Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
The Android Automerger [Tue, 13 Aug 2013 22:20:55 +0000 (15:20 -0700)]
"JWR66Y"
Santos Cordon [Tue, 13 Aug 2013 22:11:25 +0000 (22:11 +0000)]
Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev
Ying Wang [Tue, 13 Aug 2013 19:35:10 +0000 (12:35 -0700)]
Support for LOCAL_HAL_STATIC_LIBRARIES
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.
Bug:
10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
The Android Open Source Project [Tue, 13 Aug 2013 17:11:58 +0000 (10:11 -0700)]
am
5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
5aac97cbfcb3f638805311ffe733e5bf6dc29747':
"JLS36B"
JWR66X
JSS15P
The Android Open Source Project [Tue, 13 Aug 2013 17:09:56 +0000 (10:09 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08
Santos Cordon [Tue, 13 Aug 2013 04:42:24 +0000 (21:42 -0700)]
The big switch. Enabling InCallUi/Phone split by default.
.:::. .:::.
:::::::.:::::::
:::::::::::::::
':::::::::::::'
':::::::::'
':::::'
':'
with love, from California
Change-Id: Iba25accb46f81f0c36a9e3f1df0f990e27f51b9f
Ying Wang [Thu, 8 Aug 2013 23:34:29 +0000 (16:34 -0700)]
Don't bother going through the source tree
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.
Bug:
10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
The Android Automerger [Thu, 8 Aug 2013 23:53:41 +0000 (16:53 -0700)]
"JLS36B"
The Android Open Source Project [Thu, 8 Aug 2013 21:14:13 +0000 (14:14 -0700)]
am
f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
f66a269fa4300fa691348bdd55a2a16ff55de608':
JWR66W
JSS15O
JLS36
JSS15N
"JSS15M"
"JSS15L"
"JSS15K"
The Android Automerger [Thu, 8 Aug 2013 14:47:58 +0000 (07:47 -0700)]
Fix klp-dev build file
The Android Automerger [Thu, 8 Aug 2013 14:39:23 +0000 (07:39 -0700)]
"KRS39B"
The Android Automerger [Thu, 8 Aug 2013 14:37:17 +0000 (07:37 -0700)]
merge in klp-dev history after reset to master
Jason Monk [Thu, 8 Aug 2013 02:41:28 +0000 (02:41 +0000)]
Merge "Add libpac, pacserver, and ProxyHandler to build."
Jason Monk [Tue, 16 Jul 2013 14:26:09 +0000 (10:26 -0400)]
Add libpac, pacserver, and ProxyHandler to build.
This allows frameworks to reference libpac, ProxyHandler and pacserver as
required to add PAC support.
bug:
10182711
Change-Id: Iffac836a517518bd4b9a473e09372fbd10315539
The Android Automerger [Wed, 7 Aug 2013 23:10:36 +0000 (16:10 -0700)]
JWR66X
The Android Automerger [Wed, 7 Aug 2013 23:02:33 +0000 (16:02 -0700)]
JSS15P
The Android Open Source Project [Wed, 7 Aug 2013 16:42:55 +0000 (09:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: Ib795b6944220a2b13f6def23ee279815e53ac6b4
The Android Automerger [Wed, 7 Aug 2013 16:23:00 +0000 (09:23 -0700)]
Fix dev branch Build ID
The Android Automerger [Wed, 7 Aug 2013 16:16:08 +0000 (09:16 -0700)]
"KRS38B"
The Android Automerger [Wed, 7 Aug 2013 03:33:52 +0000 (20:33 -0700)]
JWR66W
The Android Automerger [Wed, 7 Aug 2013 03:09:28 +0000 (20:09 -0700)]
JSS15O
Mike Lockwood [Tue, 6 Aug 2013 23:07:13 +0000 (16:07 -0700)]
Fix typo from previous change to fix the build
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
Mike Lockwood [Tue, 6 Aug 2013 22:07:18 +0000 (15:07 -0700)]
Add support for overriding default Java libraries on a per-target basis
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
Stuart Scott [Mon, 5 Aug 2013 22:21:00 +0000 (15:21 -0700)]
Add boot jars to fix Dalvik missing bootclasspath for mini emulator.
bug:
10146858
Change-Id: I159a5951a036f32c7eb02569c5b0fb12ce3a76dd
The Android Automerger [Mon, 5 Aug 2013 22:25:41 +0000 (15:25 -0700)]
JLS36
The Android Automerger [Mon, 5 Aug 2013 18:12:19 +0000 (11:12 -0700)]
JSS15N
Ying Wang [Sat, 3 Aug 2013 00:58:22 +0000 (17:58 -0700)]
am
4a0929e3: am
38775140: am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
4a0929e3590b08838280bffae56d357a6194260e':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:50:03 +0000 (17:50 -0700)]
resolved conflicts for merge of
79ee17ea to master
Change-Id: I78ae4a54bdc05df984061ac0b0d0fc3488b0534e
Ying Wang [Sat, 3 Aug 2013 00:40:59 +0000 (17:40 -0700)]
am
38775140: am
08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '
387751401ca83e4419444247a176f2ea1f35a50b':
Remove unnecessary dependencies between host and target modules.
Stephen Hines [Sat, 3 Aug 2013 00:40:58 +0000 (17:40 -0700)]
am
367e56f1: am
3fc8dacd: Remove abcc from build.
* commit '
367e56f1b7d79086785f61c8c522644f134c3136':
Remove abcc from build.