Commit graph

12853 commits

Author SHA1 Message Date
Ying Wang
c13a61e462 am 08ba77ae: am b9267c69: Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
* commit '08ba77ae565ca3c4ddfcbd5432bf7d7e3a53963f':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
2013-04-16 17:42:32 -07: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
Ying Wang
237770761f 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
2013-04-16 09:02:55 -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
Dirk Dougherty
070733887a 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.
2013-04-15 21:55:23 -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
Dirk Dougherty
116f87d913 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.
2013-04-15 15:56:44 -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
Dirk Dougherty
7f8fd3b133 am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '7098897fecff6ec586a078025676b8203ab2060d':
  Doc change: css for policy docs.
2013-04-15 15:47:08 -07:00
Dirk Dougherty
7098897fec am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '53facc05af437f0721646102442c61c49b2e33be':
  Doc change: css for policy docs.
2013-04-15 15:44:44 -07:00
Dirk Dougherty
53facc05af am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '4f425e4284024e21c7e65a7840d8e1a45d916756':
  Doc change: css for policy docs.
2013-04-15 15:41:54 -07:00
Dirk Dougherty
4f425e4284 am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '48732d9aaa765576d98f07fabd856a17528cb826':
  Doc change: css for policy docs.
2013-04-15 15:37:54 -07:00
Dirk Dougherty
48732d9aaa am bec14294: Doc change: css for policy docs.
* commit 'bec142949a33bf7d195d022e9ec99a1a84197065':
  Doc change: css for policy docs.
2013-04-15 15:34:05 -07:00
The Android Open Source Project
721e3d0900 am 1a34a19f: Reconcile with jb-mr2-release - do not merge
* commit '1a34a19fb668dc40cd7573393e8777c78434e6e5':
  "JWR15"
  JWR11G
  JWR11F
  JWR11E
  JWR11D
  "JWR11C"
  JWR11B
2013-04-15 10:49:00 -07:00
The Android Open Source Project
1a34a19fb6 Reconcile with jb-mr2-release - do not merge
Change-Id: I49eb0fa91c0c510075419629195dcb27b9359e7d
2013-04-15 10:45:43 -07:00
The Android Automerger
920ac0436a "JWR15" 2013-04-15 05:57:31 -07:00
The Android Automerger
27dbdd21f2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:55:22 -07:00
The Android Automerger
9ab7e9575b JWR11G 2013-04-12 18:15:42 -07:00
The Android Automerger
f17a20322b JWR11F 2013-04-12 16:20:46 -07:00
The Android Automerger
cfe9beb6cb JWR11E 2013-04-12 14:32:07 -07:00
Ying Wang
b036e955fc 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
2013-04-12 14:14:36 -07:00
The Android Automerger
b70ec9e1e5 JWR11D 2013-04-12 11:30:53 -07:00
The Android Automerger
3ebe68c899 "JWR11C" 2013-04-11 23:22:16 -07:00
Dirk Dougherty
bec142949a Doc change: css for policy docs.
Change-Id: I5d8609d7e20315e5bb022f057704b2814ad9e172
2013-04-11 21:48:54 -07:00
Jeff Sharkey
9184bafc5f 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.
2013-04-11 17:18:35 -07:00
Jeff Sharkey
f416da9802 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.
2013-04-11 17:14:48 -07:00
Jeff Sharkey
021aa4cefe Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev 2013-04-12 00:12:01 +00:00
Jeff Sharkey
90baef427e DO NOT MERGE. Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
2013-04-11 17:09:56 -07:00
Ying Wang
47290a238f am f59e2624: am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
* commit 'f59e2624b33a428bbe484168ac4f96ca36a6c32e':
  Get rid of the liblog hack.
2013-04-11 16:03:48 -07:00
Ying Wang
f59e2624b3 am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev
* commit '14ae6e87c9822018e7fc139f66e60b4db6b08edb':
  Get rid of the liblog hack.
2013-04-11 16:00:58 -07:00
Ying Wang
14ae6e87c9 Merge "Get rid of the liblog hack." into jb-mr2-dev 2013-04-11 22:56:20 +00:00
Dianne Hackborn
5d0c6d9500 Merge "Fix build by removing old file." 2013-04-11 22:39:26 +00:00
Jeff Sharkey
702ed1bf18 Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
2013-04-11 15:38:12 -07:00
Doug Zongker
2fc51cbc16 Merge "SignApk: update SignApk to support SHA256withRSA signing" 2013-04-11 22:02:16 +00:00
The Android Automerger
e31a2fdfc0 JWR11B 2013-04-11 14:44:38 -07:00
The Android Open Source Project
b6bfe68df8 am c1213473: Reconcile with jb-mr2-release - do not merge
* commit 'c1213473de0890856341bed09ef08b14603ddb30':
  "JWR11"
  JWR10C
2013-04-11 07:47:12 -07:00
The Android Open Source Project
c1213473de Reconcile with jb-mr2-release - do not merge
Change-Id: I55884a9acd85fee2a3b45f5262b074731ca9ea16
2013-04-11 07:44:59 -07:00
The Android Automerger
3099d895c9 "JWR11" 2013-04-11 05:57:18 -07:00
The Android Automerger
677af3fb34 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-11 05:55:15 -07:00