The Android Automerger
5356786217
"JWR23B"
2013-04-23 09:30:27 -07:00
The Android Automerger
fb9411bc2e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-23 09:30:09 -07:00
The Android Automerger
8292769739
"JWR23"
2013-04-23 05:56:41 -07:00
The Android Automerger
22159722bc
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-23 05:55:13 -07:00
Dianne Hackborn
6007ddadc9
am 3bad5540: Here lies JB MR2: In with a whimper, out with a bang.
...
* commit '3bad5540018f191ce61ce8c8df4e096275044d14':
Here lies JB MR2: In with a whimper, out with a bang.
2013-04-23 03:51:38 -07:00
Chad Jones
9d53a1d609
am b6c2e6b6: Merge commit \'3359ffe4\' into jb-mr2-dev
...
* commit 'b6c2e6b60cd9c01b853b31c29ad1c7ebbcfe2f5a':
2013-04-23 03:51:37 -07:00
The Android Automerger
6ef2890950
JWR22B
2013-04-22 17:00:35 -07:00
Dianne Hackborn
3bad554001
Here lies JB MR2: In with a whimper, out with a bang.
...
Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684
2013-04-22 13:07:44 -07:00
The Android Automerger
099c8b35dd
"JWR22"
2013-04-22 05:57:26 -07:00
The Android Automerger
d431376376
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-22 05:55:11 -07:00
Chad Jones
aa05ac49db
Merge commit 'f0df12ae' into jb-mr2-dev-plus-aosp
2013-04-19 20:55:19 -07:00
Chad Jones
b6c2e6b60c
Merge commit '3359ffe4' into jb-mr2-dev
2013-04-19 20:24:07 -07:00
Robert Ly
f0df12ae6a
am 3359ffe4: am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit '3359ffe4ddd083dc76034ac0284b1c216fa7a633':
sac template fixes
2013-04-19 14:34:25 -07:00
Robert Ly
3359ffe4dd
am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit '062dc2c6b2b8bab43241c2d4c93f0d35e9180b2e':
sac template fixes
2013-04-19 14:32:15 -07:00
Robert Ly
062dc2c6b2
am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit 'cd197b2461281ff1d123b987dbd1c2a5b5236cd2':
sac template fixes
2013-04-19 14:29:17 -07:00
Robert Ly
cd197b2461
am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit '17a52ff0682b82d99c82b5920619f6de19879a28':
sac template fixes
2013-04-19 14:25:43 -07:00
Robert Ly
17a52ff068
am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
...
* commit '8b4f4f6bb3acd40e4e554ab61e3b1166686775c1':
sac template fixes
2013-04-19 14:23:40 -07:00
Robert Ly
8b4f4f6bb3
Merge "sac template fixes" into jb-mr1.1-docs
2013-04-19 21:21:47 +00:00
The Android Automerger
7d2bda02d7
JWR18C
2013-04-19 12:12:09 -07:00
The Android Automerger
e28954236a
JWR18B
2013-04-19 09:56:15 -07:00
Robert Ly
dbfc4bbc95
sac template fixes
...
Change-Id: I9e3c6b60c1fab71c53408f34d388653e85e6ba30
2013-04-18 11:35:16 -07:00
The Android Automerger
4279aa74b8
"JWR18"
2013-04-18 05:56:59 -07:00
The Android Automerger
678de99967
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-18 05:55:17 -07:00
Jean-Baptiste Queru
b81dc8414a
am f7e5c424: Reconcile with mr1.1-release
...
* commit 'f7e5c424080c75e003115aa248c90468c0b9b00a':
This is JER09
This is JER08
JER05
2013-04-17 15:08:22 -07:00
The Android Automerger
fec4c43d3b
JWR17B
2013-04-17 15:00:34 -07:00
Jean-Baptiste Queru
f7e5c42408
Reconcile with mr1.1-release
...
Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7
2013-04-17 14:20:24 -07:00
Ying Wang
c5cd2c6ddb
am b1578404: Merge "Fix /system/app/.odex not updated issue"
...
* commit 'b1578404624f2369bb92a1e69c02f2ef15372002':
Fix /system/app/$app.odex not updated issue
2013-04-17 10:30:42 -07:00
Ying Wang
b157840462
Merge "Fix /system/app/$app.odex not updated issue"
2013-04-17 16:23:11 +00:00
The Android Automerger
edc92a0977
"JWR17"
2013-04-17 05:56:52 -07:00
The Android Automerger
0155db520d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-17 05:55:11 -07:00
Chih-Wei Huang
868e0c5a00
Fix /system/app/$app.odex not updated issue
...
$(built_odex) depends on $(LOCAL_BUILT_MODULE) but doesn't have any build
recipe. It is built by the rules of $(LOCAL_BUILT_MODULE) that results in
a subtle bug: $(built_odex) is always newer than $(LOCAL_BUILT_MODULE)
if $(LOCAL_BUILT_MODULE) rebuilt. Therefore 'make' thinks the targets
(/system/app/$app.odex) depending on $(built_odex) don't need to be updated.
It seems an allegedly optimization bug of 'make'.
The simple fix is to explicitly add $(LOCAL_BUILT_MODULE) as a dependency
of $(installed_odex).
2013-04-17 16:00:40 +08:00
Ying Wang
08ba77ae56
am b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
...
* commit 'b9267c692084b862587af018a44b1fbe2f824d89':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
2013-04-16 17:40:26 -07:00
Ying Wang
b9267c6920
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
...
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
2013-04-16 17:36:39 -07:00
The Android Automerger
1709f39a72
JWR16B
2013-04-16 15:17:49 -07:00
Ying Wang
8150cfcb20
am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
...
* commit '9592af96a7ab330b537a4d65474177805bba2ac1':
Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
2013-04-16 09:01:11 -07:00
Ying Wang
9592af96a7
Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
2013-04-16 15:57:48 +00:00
The Android Automerger
9165c3f695
"JWR16"
2013-04-16 05:56:35 -07:00
The Android Automerger
1e0ee1f249
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-16 05:55:06 -07:00
Dirk Dougherty
c7ac60deed
am 9b855f67: am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
...
* commit '9b855f672bfe106f2628746a69150717b0c440dd':
Doc change: css for checklist more resources blocks.
2013-04-15 20:48:58 -07:00
Dirk Dougherty
9b855f672b
am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
...
* commit 'b676ec7b1e2e0764de85547a4b91294d16d32a3b':
Doc change: css for checklist more resources blocks.
2013-04-15 20:45:47 -07:00
Dirk Dougherty
b676ec7b1e
am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
...
* commit '6cdbe88d0bad6723e50d91585a1f3328e5b77368':
Doc change: css for checklist more resources blocks.
2013-04-15 20:43:10 -07:00
Dirk Dougherty
6cdbe88d0b
am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
...
* commit 'f23bdf7843782671f1f15439e4b74cbe56031f8c':
Doc change: css for checklist more resources blocks.
2013-04-15 20:40:41 -07:00
Dirk Dougherty
f23bdf7843
am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
...
* commit '1e1244bfbe50ff60f8ea6c8a1579c915c1a66232':
Doc change: css for checklist more resources blocks.
2013-04-15 20:37:59 -07:00
Dirk Dougherty
1e1244bfbe
am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.
...
* commit 'a32f1bb4e44e932dcb6b1e17fe8c5f2dbb8127df':
Doc change: css for checklist more resources blocks.
2013-04-15 20:33:54 -07:00
Dirk Dougherty
a32f1bb4e4
am 547d9e93: Doc change: css for checklist more resources blocks.
...
* commit '547d9e93b21e62f1153aaac49c22b1f648b4fef5':
Doc change: css for checklist more resources blocks.
2013-04-15 20:30:00 -07:00
Dirk Dougherty
547d9e93b2
Doc change: css for checklist more resources blocks.
...
Change-Id: If0678b08d135f708bf6ecee49831ef233a862389
2013-04-15 18:45:42 -07:00
Ying Wang
d6b1d61d84
Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
...
Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of
LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the
installed modules introduced by LOCAL_SHARED_LIBRARIES.
This change brings back the coverage.
Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa
2013-04-15 17:41:55 -07:00
The Android Automerger
4c7ab87dc9
JWR15B
2013-04-15 16:39:23 -07:00
Dirk Dougherty
31482656f8
am befd7fe6: am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
...
* commit 'befd7fe6e7caf6c00d72e1ed375fa6fac1a56e93':
Doc change: css for policy docs.
2013-04-15 15:54:00 -07:00
Dirk Dougherty
befd7fe6e7
am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
...
* commit '7f8fd3b1333084f9e291a1948d6ef73daeccbc70':
Doc change: css for policy docs.
2013-04-15 15:51:22 -07:00
