Ying Wang
55caa3ffe4
am d7674e9a
: am 20c768d2
: am c5cc2f6d
: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
...
* commit 'd7674e9a03783852df20535cb9db26cb7e21cb5c':
[MIPS] Add support for MXU instructions for Ingenic builds.
2013-08-19 16:26:50 -07:00
Ying Wang
d7674e9a03
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.
2013-08-19 16:21:53 -07:00
Ying Wang
20c768d212
am c5cc2f6d
: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
...
* commit 'c5cc2f6dafaa1826322415f91048b97cfab80556':
[MIPS] Add support for MXU instructions for Ingenic builds.
2013-08-19 16:19:39 -07:00
Ying Wang
c5cc2f6daf
Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
2013-08-19 23:16:27 +00:00
Dirk Dougherty
5d5b7e63a7
am 3fb9cec4
: am b9fe2d2c
: am 337ebc19
: am 62c755a5
: am f5ffd4a4
: Clean up core css changes brought in with samples css.
...
* commit '3fb9cec4f5f6890175f4451654bdd1d84f9c8792':
Clean up core css changes brought in with samples css.
2013-08-19 15:09:29 -07:00
Dirk Dougherty
3fb9cec4f5
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.
2013-08-19 15:06:09 -07:00
Dirk Dougherty
b9fe2d2c93
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.
2013-08-19 15:02:50 -07:00
Dirk Dougherty
337ebc195f
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.
2013-08-19 15:00:39 -07:00
Dirk Dougherty
62c755a52a
am f5ffd4a4
: Clean up core css changes brought in with samples css.
...
* commit 'f5ffd4a40c7a2165ff6ebe24a2aa189dea6b1806':
Clean up core css changes brought in with samples css.
2013-08-19 14:57:19 -07:00
Ying Wang
430a46c024
am a3ee330a
: am fa67740a
: am 25977365
: Merge "mkbootimg: Support custom mkbootimg implementation"
...
* commit 'a3ee330ac52e188c9545c022552572e0e9541577':
mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:31:17 -07:00
Ying Wang
a3ee330ac5
am fa67740a
: am 25977365
: Merge "mkbootimg: Support custom mkbootimg implementation"
...
* commit 'fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:29:32 -07:00
Ying Wang
fa67740ae4
am 25977365
: Merge "mkbootimg: Support custom mkbootimg implementation"
...
* commit '259773656ac0c0c4ef588c949aaf21216c44b339':
mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:26:35 -07:00
Ying Wang
259773656a
Merge "mkbootimg: Support custom mkbootimg implementation"
2013-08-19 21:24:07 +00:00
Dirk Dougherty
f5ffd4a40c
Clean up core css changes brought in with samples css.
...
Change-Id: I0920695be4f6ed7085508a4451c13bc7d9e65d9a
2013-08-19 12:26:07 -07:00
Dirk Dougherty
84ec0bab28
am 03fb7473
: am 2d028379
: am 6d244fb2
: am d5ac8330
: am 4f7e5159
: doc change: Samples browsing: basic support in templates and js/css.
...
* commit '03fb7473c4e21b2ae1ce9d31596416dc921c565f':
doc change: Samples browsing: basic support in templates and js/css.
2013-08-19 12:20:54 -07:00
Dirk Dougherty
03fb7473c4
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.
2013-08-19 12:19:15 -07:00
Dirk Dougherty
2d0283792d
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.
2013-08-19 12:14:19 -07:00
Dirk Dougherty
6d244fb2ed
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.
2013-08-19 12:12:07 -07:00
Dirk Dougherty
d5ac833061
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.
2013-08-19 12:09:46 -07:00
Dirk Dougherty
4f7e515940
doc change: Samples browsing: basic support in templates and js/css.
...
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
2013-08-19 11:28:59 -07:00
Ying Wang
37781e1a2a
am 208c6772
: am a7deb085
: Add phony goal GET-INSTALL-PATH
...
* commit '208c677263f2df820f498ccb04abeabbaae50548':
Add phony goal GET-INSTALL-PATH
2013-08-16 17:30:07 -07:00
Ying Wang
208c677263
am a7deb085
: Add phony goal GET-INSTALL-PATH
...
* commit 'a7deb0857c4fc0799cd1ebb82ff79dcbe2745ec0':
Add phony goal GET-INSTALL-PATH
2013-08-16 17:21:59 -07:00
Ying Wang
a7deb0857c
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
2013-08-16 13:24:47 -07:00
Pete Delaney
cc41f01490
[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>
2013-08-15 18:32:12 -07:00
Scott Main
32347f77a7
am b8edbc0f
: 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
...
* commit 'b8edbc0f7e5fbd1ef337cda0465ef9f4eedbe05c':
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).
2013-08-15 15:02:10 -07:00
Scott Main
b8edbc0f7e
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).
2013-08-15 14:57:11 -07:00
Scott Main
6f03bd6092
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).
2013-08-15 14:51:37 -07:00
Ying Wang
7a2f615d58
am 0634a437
: am 3208b615
: am fc8b6338
: resolved conflicts for merge of d65a7da3
to jb-mr2-dev-plus-aosp
...
* commit '0634a437a35df3563ec25f720e64638464a5def6':
No need to filter out AndroidConfig.h for unbundled build
2013-08-15 14:47:20 -07:00
Scott Main
ce478d54ad
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).
2013-08-15 14:45:35 -07:00
Scott Main
7e45328053
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).
2013-08-15 14:43:45 -07:00
Ying Wang
0634a437a3
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
2013-08-15 14:42:57 -07:00
Ying Wang
3208b615c5
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
2013-08-15 14:34:09 -07:00
Scott Main
52dd206715
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
2013-08-15 12:22:28 -07:00
Ying Wang
fc8b633851
resolved conflicts for merge of d65a7da3
to jb-mr2-dev-plus-aosp
...
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
2013-08-15 12:02:30 -07:00
Ying Wang
d65a7da320
am f4723fa4
: No need to filter out AndroidConfig.h for unbundled build
...
* commit 'f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
No need to filter out AndroidConfig.h for unbundled build
2013-08-15 11:55:46 -07:00
Ying Wang
f4723fa49b
No need to filter out AndroidConfig.h for unbundled build
...
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
2013-08-15 11:01:10 -07:00
Ying Wang
a3b7593546
Support to optionally run rmtypedefs.
...
Bug: 10330586
Change-Id: I6ddfca2ec986cf2c82b0942b7a5360508f095e9a
2013-08-14 18:20:54 -07:00
The Android Open Source Project
ff4313d822
am 461cac97
: (-s ours) Reconcile with klp-release - do not merge
...
* commit '461cac97962d4353311d14ad092ecbe44d3097b1': (172 commits)
"KRS45B"
"KRS45"
"KRS44C"
"KRS44B"
"KRS44"
"KRS43B"
"KRS43"
"KRS39E"
"KRS39D"
KRS39C
"KRS39B"
"KRS39"
"KRS38B"
"KRS38"
"KRS37B"
"KRS37"
KRS36B
"KRS36"
"KRS31E"
"KRS31D"
...
2013-08-14 14:45:25 -07:00
The Android Open Source Project
461cac9796
Reconcile with klp-release - do not merge
...
Change-Id: Ic55943955deea3d844a22c766f3a389e6793925a
2013-08-14 14:44:03 -07:00
Vineeta Srivastava
23ac1da7b4
am cc3fcd04
: am 477b12b4
: Fix missing camera from aosp builds.
...
* commit 'cc3fcd04f40549dff1c95aec71dfaf1f793750a8':
Fix missing camera from aosp builds.
2013-08-14 13:48:55 -07:00
Vineeta Srivastava
cc3fcd04f4
am 477b12b4
: Fix missing camera from aosp builds.
...
* commit '477b12b45ad0c8e73aafe12e3056c051080c0de9':
Fix missing camera from aosp builds.
2013-08-14 13:45:43 -07:00
Vineeta Srivastava
477b12b45a
Fix missing camera from aosp builds.
...
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.
Bug: 10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
2013-08-14 13:29:33 -07:00
The Android Automerger
821ca8d814
"KRS45B"
2013-08-14 12:37:11 -07:00
The Android Open Source Project
90998b8dd7
am eb8e4d14
: (-s ours) am f8fab173
: am fb2188d1
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'eb8e4d14d7cb1fa35c5c7769b2fa083590511ee0':
"JWR66Y"
2013-08-14 12:34:06 -07:00
The Android Open Source Project
eb8e4d14d7
am f8fab173
: am fb2188d1
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'f8fab17322ebc221fb493331c3a93b2d852704ae':
"JWR66Y"
2013-08-14 12:19:43 -07:00
The Android Open Source Project
f8fab17322
am fb2188d1
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'fb2188d1390841285181256a0ec37c5558c971da':
"JWR66Y"
2013-08-14 12:16:12 -07:00
The Android Open Source Project
fb2188d139
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b
2013-08-14 12:06:41 -07:00
Ying Wang
3a0da6471d
am 7a43a0c1
: am 66956dc0
: am 396fd67d
: am b9eee184
: am e391e7a8
: Remove -allowaccessmodification from the basic Proguard flags
...
* commit '7a43a0c105e1392a4f604cae0164698daa571adc':
Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:37:08 -07:00
Ying Wang
7a43a0c105
am 66956dc0
: am 396fd67d
: am b9eee184
: am e391e7a8
: Remove -allowaccessmodification from the basic Proguard flags
...
* commit '66956dc063351f30434da9b6bb62183b50996583':
Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:33:58 -07:00
Ying Wang
66956dc063
am 396fd67d
: am b9eee184
: am e391e7a8
: Remove -allowaccessmodification from the basic Proguard flags
...
* commit '396fd67d7a691a1226783f1b15442af86137eb3d':
Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:28:18 -07:00