OSDN Git Service

android-x86/build.git
11 years agomerge in master-release history after reset to master
The Android Automerger [Mon, 22 Apr 2013 14:49:09 +0000 (07:49 -0700)]
merge in master-release history after reset to master

11 years agoam aa05ac49: Merge commit \'f0df12ae\' into jb-mr2-dev-plus-aosp
Chad Jones [Sat, 20 Apr 2013 07:14:04 +0000 (00:14 -0700)]
am aa05ac49: Merge commit \'f0df12ae\' into jb-mr2-dev-plus-aosp

* commit 'aa05ac49db5c2a50baafedb816a404428cf6c482':

11 years agoMerge commit 'f0df12ae'
Chad Jones [Sat, 20 Apr 2013 03:56:28 +0000 (20:56 -0700)]
Merge commit 'f0df12ae'

11 years agoMerge commit 'f0df12ae' into jb-mr2-dev-plus-aosp
Chad Jones [Sat, 20 Apr 2013 03:55:19 +0000 (20:55 -0700)]
Merge commit 'f0df12ae' into jb-mr2-dev-plus-aosp

11 years agoam 3359ffe4: am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template...
Robert Ly [Fri, 19 Apr 2013 21:34:25 +0000 (14:34 -0700)]
am 3359ffe4: am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '3359ffe4ddd083dc76034ac0284b1c216fa7a633':
  sac template fixes

11 years agoam 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into...
Robert Ly [Fri, 19 Apr 2013 21:32:15 +0000 (14:32 -0700)]
am 062dc2c6: am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '062dc2c6b2b8bab43241c2d4c93f0d35e9180b2e':
  sac template fixes

11 years agoam cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:29:17 +0000 (14:29 -0700)]
am cd197b24: am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit 'cd197b2461281ff1d123b987dbd1c2a5b5236cd2':
  sac template fixes

11 years agoam 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:25:43 +0000 (14:25 -0700)]
am 17a52ff0: am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '17a52ff0682b82d99c82b5920619f6de19879a28':
  sac template fixes

11 years agoam 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:23:40 +0000 (14:23 -0700)]
am 8b4f4f6b: Merge "sac template fixes" into jb-mr1.1-docs

* commit '8b4f4f6bb3acd40e4e554ab61e3b1166686775c1':
  sac template fixes

11 years agoMerge "sac template fixes" into jb-mr1.1-docs
Robert Ly [Fri, 19 Apr 2013 21:21:47 +0000 (21:21 +0000)]
Merge "sac template fixes" into jb-mr1.1-docs

11 years ago"AAR19"
The Android Automerger [Fri, 19 Apr 2013 14:52:11 +0000 (07:52 -0700)]
"AAR19"

11 years agomerge in master-release history after reset to master
The Android Automerger [Fri, 19 Apr 2013 14:49:09 +0000 (07:49 -0700)]
merge in master-release history after reset to master

11 years agosac template fixes
Robert Ly [Thu, 18 Apr 2013 18:35:16 +0000 (11:35 -0700)]
sac template fixes

Change-Id: I9e3c6b60c1fab71c53408f34d388653e85e6ba30

11 years ago"AAR18"
The Android Automerger [Thu, 18 Apr 2013 14:51:42 +0000 (07:51 -0700)]
"AAR18"

11 years agomerge in master-release history after reset to master
The Android Automerger [Thu, 18 Apr 2013 14:49:18 +0000 (07:49 -0700)]
merge in master-release history after reset to master

11 years agoam b81dc841: am f7e5c424: Reconcile with mr1.1-release
Jean-Baptiste Queru [Wed, 17 Apr 2013 22:13:27 +0000 (15:13 -0700)]
am b81dc841: am f7e5c424: Reconcile with mr1.1-release

* commit 'b81dc8414a80fc1cbd809609f212702bda36f449':
  This is JER09
  This is JER08
  JER05

11 years agoam f7e5c424: Reconcile with mr1.1-release
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

11 years agoReconcile with mr1.1-release
Jean-Baptiste Queru [Wed, 17 Apr 2013 21:17:15 +0000 (14:17 -0700)]
Reconcile with mr1.1-release

Change-Id: I61e5c59ba2ba1e1072440cc46202a88d3f89c1f7

11 years agoam c5cd2c6d: am b1578404: Merge "Fix /system/app/.odex not updated issue"
Ying Wang [Wed, 17 Apr 2013 17:43:46 +0000 (10:43 -0700)]
am c5cd2c6d: am b1578404: Merge "Fix /system/app/.odex not updated issue"

* commit 'c5cd2c6ddb9cfdb7938c46362682fc41fd2e9ab1':
  Fix /system/app/$app.odex not updated issue

11 years agoam b1578404: Merge "Fix /system/app/.odex not updated issue"
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

11 years agoMerge "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"

11 years ago"AAR17"
The Android Automerger [Wed, 17 Apr 2013 14:51:28 +0000 (07:51 -0700)]
"AAR17"

11 years agomerge in master-release history after reset to master
The Android Automerger [Wed, 17 Apr 2013 14:49:10 +0000 (07:49 -0700)]
merge in master-release history after reset to master

11 years agoFix /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).

11 years agoam 08ba77ae: am b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
Ying Wang [Wed, 17 Apr 2013 00:42:32 +0000 (17:42 -0700)]
am 08ba77ae: am b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools

* commit '08ba77ae565ca3c4ddfcbd5432bf7d7e3a53963f':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools

11 years agoam b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
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

11 years agoAugment 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

11 years ago"AAR16B"
The Android Automerger [Tue, 16 Apr 2013 19:22:05 +0000 (12:22 -0700)]
"AAR16B"

11 years agomerge in master-release history after reset to master
The Android Automerger [Tue, 16 Apr 2013 19:21:20 +0000 (12:21 -0700)]
merge in master-release history after reset to master

11 years agoam 8150cfcb: am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED...
Ying Wang [Tue, 16 Apr 2013 16:02:55 +0000 (09:02 -0700)]
am 8150cfcb: am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev

* commit '8150cfcb209dfb6ad86413cf3d4373d074f54062':
  Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES

11 years agoam 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES...
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

11 years agoMerge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev
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

11 years ago"AAR16"
The Android Automerger [Tue, 16 Apr 2013 14:52:30 +0000 (07:52 -0700)]
"AAR16"

11 years agomerge in master-release history after reset to master
The Android Automerger [Tue, 16 Apr 2013 14:49:12 +0000 (07:49 -0700)]
merge in master-release history after reset to master

11 years agoam c7ac60de: am 9b855f67: am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am...
Dirk Dougherty [Tue, 16 Apr 2013 04:55:23 +0000 (21:55 -0700)]
am c7ac60de: am 9b855f67: am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources blocks.

* commit 'c7ac60deed026137f56d7ea2181d41239cd74398':
  Doc change: css for checklist more resources blocks.

11 years agoam 9b855f67: am b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am...
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.

11 years agoam b676ec7b: am 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc...
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.

11 years agoam 6cdbe88d: am f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css...
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.

11 years agoam f23bdf78: am 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist...
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.

11 years agoam 1e1244bf: am a32f1bb4: am 547d9e93: Doc change: css for checklist more resources...
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.

11 years agoam a32f1bb4: am 547d9e93: 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.

11 years agoam 547d9e93: 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.

11 years agoDoc 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

11 years agoDo vendor check on modules installed by LOCAL_SHARED_LIBRARIES
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

11 years agoam 31482656: am befd7fe6: am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am...
Dirk Dougherty [Mon, 15 Apr 2013 22:56:44 +0000 (15:56 -0700)]
am 31482656: am befd7fe6: am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.

* commit '31482656f894ff1ef45e0914f54ba4dc47599990':
  Doc change: css for policy docs.

11 years agoam befd7fe6: am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am...
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.

11 years agoam 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc...
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.

11 years agoam 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css...
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.

11 years agoam 53facc05: am 4f425e42: am 48732d9a: am bec14294: 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.

11 years agoam 4f425e42: am 48732d9a: am bec14294: 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.

11 years agoam 48732d9a: am bec14294: 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.

11 years agoam bec14294: 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.

11 years agoam 1a34a19f: Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 15 Apr 2013 17:49:00 +0000 (10:49 -0700)]
am 1a34a19f: Reconcile with jb-mr2-release - do not merge

* commit '1a34a19fb668dc40cd7573393e8777c78434e6e5':
  "JWR15"
  JWR11G
  JWR11F
  JWR11E
  JWR11D
  "JWR11C"
  JWR11B

11 years agoReconcile with jb-mr2-release - do not merge
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

11 years ago"AAR15"
The Android Automerger [Mon, 15 Apr 2013 14:52:28 +0000 (07:52 -0700)]
"AAR15"

11 years agomerge in master-release history after reset to master
The Android Automerger [Mon, 15 Apr 2013 14:49:20 +0000 (07:49 -0700)]
merge in master-release history after reset to master

11 years ago"JWR15"
The Android Automerger [Mon, 15 Apr 2013 12:57:31 +0000 (05:57 -0700)]
"JWR15"

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
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

11 years agoJWR11G
The Android Automerger [Sat, 13 Apr 2013 01:15:42 +0000 (18:15 -0700)]
JWR11G

11 years agoJWR11F
The Android Automerger [Fri, 12 Apr 2013 23:20:46 +0000 (16:20 -0700)]
JWR11F

11 years agoJWR11E
The Android Automerger [Fri, 12 Apr 2013 21:32:07 +0000 (14:32 -0700)]
JWR11E

11 years agoAllow to set BUILD_EMULATOR outside the core build system.
Ying Wang [Fri, 12 Apr 2013 21:14:36 +0000 (14:14 -0700)]
Allow to set BUILD_EMULATOR outside the core build system.

For example, you can set it as enviromental variable, command line
makefile variable, or board config variable.

Change-Id: I5a4dbb70270cb4952109b5d96fbbf61eb2603502

11 years agoJWR11D
The Android Automerger [Fri, 12 Apr 2013 18:30:53 +0000 (11:30 -0700)]
JWR11D

11 years ago"AAR12"
The Android Automerger [Fri, 12 Apr 2013 14:51:55 +0000 (07:51 -0700)]
"AAR12"

11 years agomerge in master-release history after reset to master
The Android Automerger [Fri, 12 Apr 2013 14:49:28 +0000 (07:49 -0700)]
merge in master-release history after reset to master

11 years ago"JWR11C"
The Android Automerger [Fri, 12 Apr 2013 06:22:16 +0000 (23:22 -0700)]
"JWR11C"

11 years agoDoc change: css for policy docs.
Dirk Dougherty [Thu, 11 Apr 2013 03:23:40 +0000 (20:23 -0700)]
Doc change: css for policy docs.

Change-Id: I5d8609d7e20315e5bb022f057704b2814ad9e172

11 years agoam f416da98: am 021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into...
Jeff Sharkey [Fri, 12 Apr 2013 00:18:35 +0000 (17:18 -0700)]
am f416da98: am 021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev

* commit 'f416da980218b0c61bed1bcaa0048a5e8f7285a1':
  DO NOT MERGE. Fix build by removing old file.

11 years agoam 021aa4ce: Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
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.

11 years agoMerge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev
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

11 years agoDO NOT MERGE. Fix build by removing old file.
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

11 years agoam f59e2624: am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
Ying Wang [Thu, 11 Apr 2013 23:03:48 +0000 (16:03 -0700)]
am f59e2624: am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev

* commit 'f59e2624b33a428bbe484168ac4f96ca36a6c32e':
  Get rid of the liblog hack.

11 years agoam 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
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.

11 years agoMerge "Get rid of the liblog hack." into jb-mr2-dev
Ying Wang [Thu, 11 Apr 2013 22:56:20 +0000 (22:56 +0000)]
Merge "Get rid of the liblog hack." into jb-mr2-dev

11 years agoMerge "Fix build by removing old file."
Dianne Hackborn [Thu, 11 Apr 2013 22:39:25 +0000 (22:39 +0000)]
Merge "Fix build by removing old file."

11 years agoFix build by removing old file.
Jeff Sharkey [Thu, 11 Apr 2013 22:37:13 +0000 (15:37 -0700)]
Fix build by removing old file.

Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2

11 years agoMerge "SignApk: update SignApk to support SHA256withRSA signing"
Doug Zongker [Thu, 11 Apr 2013 22:02:15 +0000 (22:02 +0000)]
Merge "SignApk: update SignApk to support SHA256withRSA signing"

11 years agoJWR11B
The Android Automerger [Thu, 11 Apr 2013 21:44:38 +0000 (14:44 -0700)]
JWR11B

11 years ago"AAR11"
The Android Automerger [Thu, 11 Apr 2013 16:25:07 +0000 (09:25 -0700)]
"AAR11"

11 years agomerge in master-release history after reset to master
The Android Automerger [Thu, 11 Apr 2013 16:22:11 +0000 (09:22 -0700)]
merge in master-release history after reset to master

11 years agoam c1213473: Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 11 Apr 2013 14:47:12 +0000 (07:47 -0700)]
am c1213473: Reconcile with jb-mr2-release - do not merge

* commit 'c1213473de0890856341bed09ef08b14603ddb30':
  "JWR11"
  JWR10C

11 years agoReconcile with jb-mr2-release - do not merge
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

11 years ago"JWR11"
The Android Automerger [Thu, 11 Apr 2013 12:57:18 +0000 (05:57 -0700)]
"JWR11"

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
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

11 years agoam c9bdff96: am 3e556091: Support to dist unbundled files for bundled build
Ying Wang [Thu, 11 Apr 2013 05:12:53 +0000 (22:12 -0700)]
am c9bdff96: am 3e556091: Support to dist unbundled files for bundled build

* commit 'c9bdff96ca4270cc6f626298b05e13f92ad00551':
  Support to dist unbundled files for bundled build

11 years agoam 3e556091: Support to dist unbundled files for bundled build
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

11 years agoSupport 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

11 years agoJWR10C
The Android Automerger [Thu, 11 Apr 2013 02:07:13 +0000 (19:07 -0700)]
JWR10C

11 years agoGet rid of the liblog hack.
Ying Wang [Wed, 10 Apr 2013 06:27:57 +0000 (23:27 -0700)]
Get rid of the liblog hack.

Bug: 8580410
Change-Id: I3ece860673eb52a2db1421db4492c9b1807dda6e

11 years agoam a934e35c: Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 10 Apr 2013 22:34:45 +0000 (15:34 -0700)]
am a934e35c: Reconcile with jb-mr2-release - do not merge

* commit 'a934e35ce9dfd05fc368b8b26820c344587b9734':
  JWR10B

11 years agoReconcile with jb-mr2-release - do not merge
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

11 years agoam a752c965: am c04a8282: Revert "Get rid of the liblog hack."
Ying Wang [Wed, 10 Apr 2013 22:16:51 +0000 (15:16 -0700)]
am a752c965: am c04a8282: Revert "Get rid of the liblog hack."

* commit 'a752c965fe5d77ae6488a39685269db757dbf4f7':
  Revert "Get rid of the liblog hack."

11 years agoam c04a8282: Revert "Get rid of the liblog hack."
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."

11 years agoRevert "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

11 years agoAAR10B
The Android Automerger [Wed, 10 Apr 2013 19:46:43 +0000 (12:46 -0700)]
AAR10B

11 years agoJWR10B
The Android Automerger [Wed, 10 Apr 2013 19:18:38 +0000 (12:18 -0700)]
JWR10B

11 years agoam 43d5f927: am 76365787: Get rid of the liblog hack.
Ying Wang [Wed, 10 Apr 2013 17:13:08 +0000 (10:13 -0700)]
am 43d5f927: am 76365787: Get rid of the liblog hack.

* commit '43d5f927c1c8f7f1a7fad431560044565b5415b9':
  Get rid of the liblog hack.

11 years agoam 76365787: Get rid of the liblog hack.
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.

11 years agoam 8d4e5f11: Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Wed, 10 Apr 2013 17:08:30 +0000 (10:08 -0700)]
am 8d4e5f11: Reconcile with jb-mr2-release - do not merge

* commit '8d4e5f1166118f3c2c5e1c83e03fc4f38088aa52':
  "JWR10"
  JWR09C
  JWR09B
  "JWR09"
  JWR08B

11 years agoReconcile with jb-mr2-release - do not merge
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