OSDN Git Service
Jean-Baptiste Queru [Wed, 17 Apr 2013 22:08:22 +0000 (15:08 -0700)]
am
f7e5c424: Reconcile with mr1.1-release
* commit '
f7e5c424080c75e003115aa248c90468c0b9b00a':
This is JER09
This is JER08
JER05
Jean-Baptiste Queru [Wed, 17 Apr 2013 21:17:15 +0000 (14:17 -0700)]
Reconcile with mr1.1-release
Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7
Ying Wang [Wed, 17 Apr 2013 17:30:42 +0000 (10:30 -0700)]
am
b1578404: Merge "Fix /system/app/.odex not updated issue"
* commit '
b1578404624f2369bb92a1e69c02f2ef15372002':
Fix /system/app/$app.odex not updated issue
Ying Wang [Wed, 17 Apr 2013 16:23:10 +0000 (16:23 +0000)]
Merge "Fix /system/app/$app.odex not updated issue"
Chih-Wei Huang [Mon, 15 Apr 2013 09:12:19 +0000 (17:12 +0800)]
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).
Ying Wang [Wed, 17 Apr 2013 00:40:26 +0000 (17:40 -0700)]
am
b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
* commit '
b9267c692084b862587af018a44b1fbe2f824d89':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Ying Wang [Sat, 30 Mar 2013 00:40:14 +0000 (17:40 -0700)]
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
Ying Wang [Tue, 16 Apr 2013 16:01:11 +0000 (09:01 -0700)]
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
Ying Wang [Tue, 16 Apr 2013 15:57:48 +0000 (15:57 +0000)]
Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
Dirk Dougherty [Tue, 16 Apr 2013 03:48:58 +0000 (20:48 -0700)]
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.
Dirk Dougherty [Tue, 16 Apr 2013 03:45:47 +0000 (20:45 -0700)]
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.
Dirk Dougherty [Tue, 16 Apr 2013 03:43:10 +0000 (20:43 -0700)]
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.
Dirk Dougherty [Tue, 16 Apr 2013 03:40:41 +0000 (20:40 -0700)]
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.
Dirk Dougherty [Tue, 16 Apr 2013 03:37:59 +0000 (20:37 -0700)]
am
1e1244bf: am
a32f1bb4: am
547d9e93: Doc change: css for checklist more resources blocks.
* commit '
1e1244bfbe50ff60f8ea6c8a1579c915c1a66232':
Doc change: css for checklist more resources blocks.
Dirk Dougherty [Tue, 16 Apr 2013 03:33:54 +0000 (20:33 -0700)]
am
a32f1bb4: am
547d9e93: Doc change: css for checklist more resources blocks.
* commit '
a32f1bb4e44e932dcb6b1e17fe8c5f2dbb8127df':
Doc change: css for checklist more resources blocks.
Dirk Dougherty [Tue, 16 Apr 2013 03:30:00 +0000 (20:30 -0700)]
am
547d9e93: Doc change: css for checklist more resources blocks.
* commit '
547d9e93b21e62f1153aaac49c22b1f648b4fef5':
Doc change: css for checklist more resources blocks.
Dirk Dougherty [Tue, 16 Apr 2013 01:13:47 +0000 (18:13 -0700)]
Doc change: css for checklist more resources blocks.
Change-Id: If0678b08d135f708bf6ecee49831ef233a862389
Ying Wang [Tue, 16 Apr 2013 00:32:21 +0000 (17:32 -0700)]
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
Dirk Dougherty [Mon, 15 Apr 2013 22:54:00 +0000 (15:54 -0700)]
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.
Dirk Dougherty [Mon, 15 Apr 2013 22:51:22 +0000 (15:51 -0700)]
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.
Dirk Dougherty [Mon, 15 Apr 2013 22:47:08 +0000 (15:47 -0700)]
am
7098897f: am
53facc05: am
4f425e42: am
48732d9a: am
bec14294: Doc change: css for policy docs.
* commit '
7098897fecff6ec586a078025676b8203ab2060d':
Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:44:44 +0000 (15:44 -0700)]
am
53facc05: am
4f425e42: am
48732d9a: am
bec14294: Doc change: css for policy docs.
* commit '
53facc05af437f0721646102442c61c49b2e33be':
Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:41:54 +0000 (15:41 -0700)]
am
4f425e42: am
48732d9a: am
bec14294: Doc change: css for policy docs.
* commit '
4f425e4284024e21c7e65a7840d8e1a45d916756':
Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:37:54 +0000 (15:37 -0700)]
am
48732d9a: am
bec14294: Doc change: css for policy docs.
* commit '
48732d9aaa765576d98f07fabd856a17528cb826':
Doc change: css for policy docs.
Dirk Dougherty [Mon, 15 Apr 2013 22:34:05 +0000 (15:34 -0700)]
am
bec14294: Doc change: css for policy docs.
* commit '
bec142949a33bf7d195d022e9ec99a1a84197065':
Doc change: css for policy docs.
The Android Open Source Project [Mon, 15 Apr 2013 17:45:43 +0000 (10:45 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I49eb0fa91c0c510075419629195dcb27b9359e7d
The Android Automerger [Mon, 15 Apr 2013 12:57:31 +0000 (05:57 -0700)]
"JWR15"
The Android Automerger [Mon, 15 Apr 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sat, 13 Apr 2013 01:15:42 +0000 (18:15 -0700)]
JWR11G
The Android Automerger [Fri, 12 Apr 2013 23:20:46 +0000 (16:20 -0700)]
JWR11F
The Android Automerger [Fri, 12 Apr 2013 21:32:07 +0000 (14:32 -0700)]
JWR11E
The Android Automerger [Fri, 12 Apr 2013 18:30:53 +0000 (11:30 -0700)]
JWR11D
The Android Automerger [Fri, 12 Apr 2013 06:22:16 +0000 (23:22 -0700)]
"JWR11C"
Dirk Dougherty [Thu, 11 Apr 2013 03:23:40 +0000 (20:23 -0700)]
Doc change: css for policy docs.
Change-Id: I5d8609d7e20315e5bb022f057704b2814ad9e172
Jeff Sharkey [Fri, 12 Apr 2013 00:14:48 +0000 (17:14 -0700)]
am
021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
* commit '
021aa4cefe03fd7cca5ee4baf25a562c6f6cda20':
DO NOT MERGE. Fix build by removing old file.
Jeff Sharkey [Fri, 12 Apr 2013 00:12:00 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
Jeff Sharkey [Thu, 11 Apr 2013 22:37:13 +0000 (15:37 -0700)]
DO NOT MERGE. Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
Ying Wang [Thu, 11 Apr 2013 23:00:58 +0000 (16:00 -0700)]
am
14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
* commit '
14ae6e87c9822018e7fc139f66e60b4db6b08edb':
Get rid of the liblog hack.
Ying Wang [Thu, 11 Apr 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Get rid of the liblog hack." into jb-mr2-dev
The Android Automerger [Thu, 11 Apr 2013 21:44:38 +0000 (14:44 -0700)]
JWR11B
The Android Open Source Project [Thu, 11 Apr 2013 14:44:59 +0000 (07:44 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I55884a9acd85fee2a3b45f5262b074731ca9ea16
The Android Automerger [Thu, 11 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR11"
The Android Automerger [Thu, 11 Apr 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Thu, 11 Apr 2013 05:09:47 +0000 (22:09 -0700)]
am
3e556091: Support to dist unbundled files for bundled build
* commit '
3e55609134381cadfc3b69657a5598dc3d8f2e35':
Support to dist unbundled files for bundled build
Ying Wang [Thu, 11 Apr 2013 02:17:41 +0000 (19:17 -0700)]
Support to dist unbundled files for bundled build
Usage:
LOCAL_DIST_BUNDLED_BINARIES := true
The dist files will include the jni shared libraries and the apk with
jni libraries stripped.
Bug:
8181626
Change-Id: I4a047d786ad35b948b4ad7a51adf37321dbe395c
The Android Automerger [Thu, 11 Apr 2013 02:07:13 +0000 (19:07 -0700)]
JWR10C
Ying Wang [Wed, 10 Apr 2013 06:27:57 +0000 (23:27 -0700)]
Get rid of the liblog hack.
Bug:
8580410
Change-Id: I3ece860673eb52a2db1421db4492c9b1807dda6e
The Android Open Source Project [Wed, 10 Apr 2013 22:31:33 +0000 (15:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I7df2e132b28a7491cab9dbb36f64c8058f60a0e9
Ying Wang [Wed, 10 Apr 2013 22:14:23 +0000 (15:14 -0700)]
am
c04a8282: Revert "Get rid of the liblog hack."
* commit '
c04a8282229b624eb3aff506fb72e5fcf27b258f':
Revert "Get rid of the liblog hack."
Ying Wang [Wed, 10 Apr 2013 22:11:43 +0000 (22:11 +0000)]
Revert "Get rid of the liblog hack."
This reverts commit
7636578729ffcd02bfb5158db884f559a52d8905
Change-Id: I32f2acce5f99cb97eae986dfeba6d5d25378aefa
The Android Automerger [Wed, 10 Apr 2013 19:18:38 +0000 (12:18 -0700)]
JWR10B
Ying Wang [Wed, 10 Apr 2013 17:09:06 +0000 (10:09 -0700)]
am
76365787: Get rid of the liblog hack.
* commit '
7636578729ffcd02bfb5158db884f559a52d8905':
Get rid of the liblog hack.
The Android Open Source Project [Wed, 10 Apr 2013 17:05:13 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id8df255f1ee96ac589ce42c921ff5098c9507331
The Android Automerger [Wed, 10 Apr 2013 12:57:46 +0000 (05:57 -0700)]
"JWR10"
The Android Automerger [Wed, 10 Apr 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 06:27:57 +0000 (23:27 -0700)]
Get rid of the liblog hack.
Bug:
8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c
Ying Wang [Wed, 10 Apr 2013 05:37:04 +0000 (22:37 -0700)]
Ying Wang [Wed, 10 Apr 2013 05:37:04 +0000 (22:37 -0700)]
am
fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev
* commit '
fd068148d64cabd318a7d426840c5127f7a91160':
Revert "Add liblog"
Ying Wang [Wed, 10 Apr 2013 05:33:58 +0000 (22:33 -0700)]
Add liblog
Bug:
8580410
Change-Id: Id3c26ff084950f8cbfa87f4425747ee322de7624
Ying Wang [Wed, 10 Apr 2013 05:32:37 +0000 (05:32 +0000)]
Merge "Revert "Add liblog"" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:32:21 +0000 (05:32 +0000)]
Revert "Add liblog"
This reverts commit
8722580d90840352883a84d1ca882e50220f3959
Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8
Ying Wang [Wed, 10 Apr 2013 05:17:07 +0000 (22:17 -0700)]
am
134ec88c: Merge "Add liblog" into jb-mr2-dev
* commit '
134ec88c943ad0453d5716edceacca46a621e026':
Add liblog
Ying Wang [Wed, 10 Apr 2013 05:12:00 +0000 (05:12 +0000)]
Merge "Add liblog" into jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 04:41:48 +0000 (21:41 -0700)]
Add liblog
Bug:
8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4
The Android Automerger [Tue, 9 Apr 2013 23:00:25 +0000 (16:00 -0700)]
JWR09C
Robert Ly [Tue, 9 Apr 2013 20:45:43 +0000 (13:45 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:43:50 +0000 (13:43 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:40:36 +0000 (13:40 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:37:01 +0000 (13:37 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:33:28 +0000 (13:33 -0700)]
Robert Ly [Tue, 9 Apr 2013 20:29:57 +0000 (13:29 -0700)]
am
a4d2d0ef: s.a.c templates
* commit '
a4d2d0ef551f443445a1dffb05f530de32b01fb3':
s.a.c templates
Robert Ly [Tue, 9 Apr 2013 18:26:12 +0000 (11:26 -0700)]
s.a.c templates
Change-Id: Ia6554ba55d10af10227cde336026b51a27307aa0
The Android Automerger [Tue, 9 Apr 2013 17:05:04 +0000 (10:05 -0700)]
JWR09B
Justin Ho [Tue, 9 Apr 2013 15:21:39 +0000 (08:21 -0700)]
This is JER09
Change-Id: I0cc358c96b1c090dc26e20fec40982a21bca7474
The Android Automerger [Tue, 9 Apr 2013 12:57:13 +0000 (05:57 -0700)]
"JWR09"
The Android Automerger [Tue, 9 Apr 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 9 Apr 2013 01:53:50 +0000 (18:53 -0700)]
JWR08B
Dianne Hackborn [Mon, 8 Apr 2013 22:37:39 +0000 (15:37 -0700)]
am
51ebc822: Merge "Add new media command to build." into jb-mr2-dev
* commit '
51ebc822c1cf7cc206d5a6acc98b8a3f06227426':
Add new media command to build.
Dianne Hackborn [Mon, 8 Apr 2013 22:35:34 +0000 (22:35 +0000)]
Merge "Add new media command to build." into jb-mr2-dev
The Android Open Source Project [Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ic29dadd7db4775b7812868535dd2c510a64f0591
Justin Ho [Mon, 8 Apr 2013 15:07:26 +0000 (08:07 -0700)]
This is JER08
Change-Id: Ide7d8fd915c6ee0d0f856d8cb60d7f68ea58c961
The Android Automerger [Mon, 8 Apr 2013 12:58:37 +0000 (05:58 -0700)]
"JWR08"
The Android Automerger [Mon, 8 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Sat, 6 Apr 2013 04:06:19 +0000 (21:06 -0700)]
am
4996c807: Merge "Fix the win_sdk build."
* commit '
4996c8073e87dd9e361b385d8aeb121f4c36a221':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 04:04:23 +0000 (21:04 -0700)]
resolved conflicts for merge of
2321482e to jb-mr2-dev-plus-aosp
Change-Id: I1b144cdf6774df95c0507cc5751d7def240cf645
Ying Wang [Sat, 6 Apr 2013 02:51:24 +0000 (02:51 +0000)]
Merge "Fix the win_sdk build."
Ying Wang [Sat, 6 Apr 2013 02:51:05 +0000 (02:51 +0000)]
Merge "Switch to prebuilt bison"
Ying Wang [Sat, 6 Apr 2013 01:51:32 +0000 (18:51 -0700)]
Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
Ying Wang [Sat, 6 Apr 2013 01:57:06 +0000 (18:57 -0700)]
am
dd75a03d: Fix the win_sdk build.
* commit '
dd75a03d35499c34db913e886dbed5c37f5ce6d8':
Fix the win_sdk build.
Ying Wang [Sat, 6 Apr 2013 01:51:32 +0000 (18:51 -0700)]
Fix the win_sdk build.
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
Ying Wang [Sat, 6 Apr 2013 01:02:16 +0000 (18:02 -0700)]
Switch to prebuilt bison
Bug:
8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
Ying Wang [Sat, 6 Apr 2013 01:25:57 +0000 (18:25 -0700)]
am
854be683: Switch to prebuilt bison
* commit '
854be683636892eed455100d0c20b0f7dd8c5076':
Switch to prebuilt bison
Ying Wang [Sat, 6 Apr 2013 01:02:16 +0000 (18:02 -0700)]
Switch to prebuilt bison
Bug:
8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
Dianne Hackborn [Fri, 5 Apr 2013 01:50:45 +0000 (18:50 -0700)]
Add new media command to build.
Change-Id: I3c32924b0c6400aa22221646f8e118a66f65f628
The Android Automerger [Fri, 5 Apr 2013 22:14:45 +0000 (15:14 -0700)]
JWR04C
Ed Heyl [Fri, 5 Apr 2013 16:14:18 +0000 (09:14 -0700)]
JER05
Change-Id: Ice879d6d5884c4193e65e1445c3e077fe7151650
The Android Automerger [Thu, 4 Apr 2013 23:25:30 +0000 (16:25 -0700)]
JWR04B
The Android Automerger [Thu, 4 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR04"
The Android Automerger [Thu, 4 Apr 2013 12:55:10 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 4 Apr 2013 00:02:56 +0000 (17:02 -0700)]
JWR03B
OSDN Git Service
