OSDN Git Service
Geremy Condra [Mon, 26 Aug 2013 21:20:38 +0000 (14:20 -0700)]
am
2724d8c4: am
d5ec4db7: Merge "Add sepolicy_version to PRODUCT_PACKAGES"
* commit '
2724d8c4ac1a8eea593425d682e7244a8e5cc9da':
Add sepolicy_version to PRODUCT_PACKAGES
Geremy Condra [Mon, 26 Aug 2013 21:18:41 +0000 (14:18 -0700)]
am
d5ec4db7: Merge "Add sepolicy_version to PRODUCT_PACKAGES"
* commit '
d5ec4db790c59980ed6e38ebed32e89bca8ee13f':
Add sepolicy_version to PRODUCT_PACKAGES
Geremy Condra [Mon, 26 Aug 2013 21:16:34 +0000 (21:16 +0000)]
Merge "Add sepolicy_version to PRODUCT_PACKAGES"
Ying Wang [Fri, 23 Aug 2013 17:21:06 +0000 (10:21 -0700)]
am
c3e977ac: am
2363485c: am
06de9f94: am
8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '
c3e977acf150c54a73d7a4cd7f5d47474a122a66':
Revert "Collect and store proguard obfuscation dictionary files."
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:17:36 +0000 (10:17 -0700)]
am
58ad7061: am
93b95dc4: am
aa87a11d: am
afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '
58ad70618d4d21f16ffe89c1e0eea7e35eae918b':
Collect and store proguard obfuscation dictionary files.
Ying Wang [Fri, 23 Aug 2013 17:17:35 +0000 (10:17 -0700)]
am
c5b72527: am
ec3c15e5: am
04c4d34d: am
7311a344: Make it easier to enable obfuscation and optimization.
* commit '
c5b72527d30602568dad9fd310e82b6b12fc1106':
Make it easier to enable obfuscation and optimization.
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
William Roberts [Sat, 11 May 2013 18:21:18 +0000 (11:21 -0700)]
Add sepolicy_version to PRODUCT_PACKAGES
Change-Id: I3d2652dd594d272507c0a1485e21227149ee4af7
Signed-off-by: William Roberts <wroberts@tresys.com>
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 02:34:05 +0000 (19:34 -0700)]
am
af57f8f8: Remove input flinger stubs. (DO NOT MERGE)
* commit '
af57f8f8cd9e245331505b599dccfa3e9d43fc6a':
Remove input flinger stubs. (DO NOT MERGE)
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:42:50 +0000 (16:42 -0700)]
am
bdee9fbe: am
504dbfc3: am
fc8140d3: am
d4645ea9: remove project structure from sample landing pages
* commit '
bdee9fbe939d13e76cb45aabbcc85a22551ae297':
remove project structure from sample landing pages
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:34:00 +0000 (16:34 -0700)]
am
1ebd160a: 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 '
1ebd160a823668d42a3f8216370035da2b8e7d36':
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:34:00 +0000 (16:34 -0700)]
am
ac2fbe85: 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 '
ac2fbe8507f7295681a528e6858a0fb6676f7324':
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: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 02:18:48 +0000 (19:18 -0700)]
am
40371463: 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 ma
* commit '
40371463865331f3d7604891bb70c0a37dbf36ae':
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 [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:46:51 +0000 (12:46 -0700)]
am
a01ec9bb: Add New languages.
* commit '
a01ec9bbdd3fe554e00fdd79b5f1ad063c477581':
Add New languages.
Ying Wang [Wed, 21 Aug 2013 19:46:09 +0000 (12:46 -0700)]
am
ac2cb396: am
929b3a24: Merge "Adding the missing audio files into the SDK system image"
* commit '
ac2cb3965076c30698190769eb6606fde111748b':
Adding the missing audio files into the SDK system image
Baligh Uddin [Wed, 21 Aug 2013 19:44:02 +0000 (12:44 -0700)]
Add New languages.
Bug:
10246852
Ying Wang [Wed, 21 Aug 2013 19:43:55 +0000 (12:43 -0700)]
am
929b3a24: Merge "Adding the missing audio files into the SDK system image"
* commit '
929b3a24b0c1b1ff2488ef08f05040c63aeaa9ed':
Adding the missing audio files into the SDK system image
Ying Wang [Wed, 21 Aug 2013 19:42:14 +0000 (19:42 +0000)]
Merge "Adding the missing audio files into the SDK system image"
Mathew Inwood [Wed, 21 Aug 2013 17:13:33 +0000 (10:13 -0700)]
am
0735c5f0: Remove ApplicationsProvider.
* commit '
0735c5f08cd6dd617965c57ca5607b2c26c7ca6e':
Remove ApplicationsProvider.
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:32:45 +0000 (17:32 -0700)]
am
91efe6bb: Merge "Enhance \'stacks\' script to handle native processes." into klp-dev
* commit '
91efe6bbb7bd05038b7ec4e713b70582b7dd53a2':
Enhance 'stacks' script to handle native processes.
Scott Main [Wed, 21 Aug 2013 00:32:44 +0000 (17:32 -0700)]
am
0dcef01e: 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 '
0dcef01e1e08ca61754cbfd8ebe8d13696beb31e':
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
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:41:51 +0000 (16:41 -0700)]
am
d33c33f7: Merge "Remove old PAC dependency and add new one." into klp-dev
* commit '
d33c33f71cc57cbaf99fefa11360c0f6d127e2ea':
Remove old PAC dependency and add new one.
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
Ying Wang [Mon, 19 Aug 2013 23:21:53 +0000 (16:21 -0700)]
am
20c768d2: am
c5cc2f6d: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
* commit '
20c768d2128364a6a9373dd8ef432bf55512bf37':
[MIPS] Add support for MXU instructions for Ingenic builds.
Ying Wang [Mon, 19 Aug 2013 23:19:39 +0000 (16:19 -0700)]
am
c5cc2f6d: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
* commit '
c5cc2f6dafaa1826322415f91048b97cfab80556':
[MIPS] Add support for MXU instructions for Ingenic builds.
Ying Wang [Mon, 19 Aug 2013 23:16:27 +0000 (23:16 +0000)]
Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
Dirk Dougherty [Mon, 19 Aug 2013 22:06:09 +0000 (15:06 -0700)]
am
b9fe2d2c: am
337ebc19: am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
b9fe2d2c93ae9734d174f07427ebb3d17b7b346c':
Clean up core css changes brought in with samples css.
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.
Ying Wang [Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)]
am
fa67740a: am
25977365: Merge "mkbootimg: Support custom mkbootimg implementation"
* commit '
fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
mkbootimg: Support custom mkbootimg implementation
Ying Wang [Mon, 19 Aug 2013 21:26:35 +0000 (14:26 -0700)]
am
25977365: Merge "mkbootimg: Support custom mkbootimg implementation"
* commit '
259773656ac0c0c4ef588c949aaf21216c44b339':
mkbootimg: Support custom mkbootimg implementation
Ying Wang [Mon, 19 Aug 2013 21:24:07 +0000 (21:24 +0000)]
Merge "mkbootimg: Support custom mkbootimg implementation"
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:19:15 +0000 (12:19 -0700)]
am
2d028379: am
6d244fb2: am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
2d0283792d1fd2fcb4f1dcdc4b34e40515f7393c':
doc change: Samples browsing: basic support in templates and js/css.
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 [Sat, 17 Aug 2013 00:21:59 +0000 (17:21 -0700)]
am
a7deb085: Add phony goal GET-INSTALL-PATH
* commit '
a7deb0857c4fc0799cd1ebb82ff79dcbe2745ec0':
Add phony goal GET-INSTALL-PATH
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
Pete Delaney [Fri, 16 Aug 2013 01:26:14 +0000 (18:26 -0700)]
[MIPS] Add support for MXU instructions for Ingenic builds.
This enables an Ingenic build to use MXU asm instructions.
MXU support was just recently added:
ASM: https://android-review.googlesource.com/63701
GCC: https://android-review.googlesource.com/63702
BIN: https://android-review.googlesource.com/#/c/63704/
Change-Id: I2b60567a689efa70ec064dfbb0f241a6bc61aed1
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Scott Main [Thu, 15 Aug 2013 21:57:11 +0000 (14:57 -0700)]
am
6f03bd60: 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 an
* commit '
6f03bd6092cba47d073e8bdc131d1cba89fa6c7c':
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: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:42:57 +0000 (14:42 -0700)]
am
3208b615: am
fc8b6338: resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
* commit '
3208b615c5cde2b682c3bbbcd2bb064b14b57489':
No need to filter out AndroidConfig.h for unbundled build
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
The Android Open Source Project [Wed, 14 Aug 2013 21:44:03 +0000 (14:44 -0700)]
Reconcile with klp-release - do not merge
Change-Id: Ic55943955deea3d844a22c766f3a389e6793925a
Vineeta Srivastava [Wed, 14 Aug 2013 20:45:43 +0000 (13:45 -0700)]
am
477b12b4: Fix missing camera from aosp builds.
* commit '
477b12b45ad0c8e73aafe12e3056c051080c0de9':
Fix missing camera from aosp builds.
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 Automerger [Wed, 14 Aug 2013 19:37:11 +0000 (12:37 -0700)]
"KRS45B"
The Android Open Source Project [Wed, 14 Aug 2013 19:19:43 +0000 (12:19 -0700)]
am
f8fab173: am
fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
f8fab17322ebc221fb493331c3a93b2d852704ae':
"JWR66Y"
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:33:58 +0000 (09:33 -0700)]
am
66956dc0: am
396fd67d: am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
66956dc063351f30434da9b6bb62183b50996583':
Remove -allowaccessmodification from the basic Proguard flags
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