StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,158 Commits 1 Branch 0 Tags
35a6b4fb65b17fbc698fbd0796eee89b7a06c5e9
Commit Graph

11158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
1aace7da06 am 502c939f: docs: add support for an infinite number of nested lists in side nav 
* commit '502c939f6d0818d985a45ca54e35c0a3efa1470b':
  docs: add support for an infinite number of nested lists in side nav
 2012-11-27 15:09:17 -08:00
Scott Main
502c939f6d docs: add support for an infinite number of nested lists in side nav 
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
 2012-11-27 15:00:40 -08:00
Ying Wang
b40018cf1f am caee64a9: am f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH 
* commit 'caee64a98ac6f7f88888e2105ca07da17bb6311b':
  Put ANDROID_BUILD_PATHS before the system default PATH
 2012-11-27 14:21:06 -08:00
Ying Wang
caee64a98a am f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH 
* commit 'f44a518c104b706c752b671b0308716c7cca73d5':
  Put ANDROID_BUILD_PATHS before the system default PATH
 2012-11-27 14:18:53 -08:00
Ying Wang
f44a518c10 am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH 
* commit 'c69b773506ecf2316059a9fe947bbeb524a402b3':
  Put ANDROID_BUILD_PATHS before the system default PATH
 2012-11-27 14:17:27 -08:00
Ying Wang
c69b773506 Put ANDROID_BUILD_PATHS before the system default PATH 
So tools like adb that are built from source won't be overridden by the
host system tools, when you run these tools without specifying the path.

Change-Id: I2f0a288b38fabf57c7a4aa3bae5e42d7b734398d
 2012-11-27 14:14:42 -08:00
Keun young Park
6343d2a356 am 490d3f24: am d4f8d5e6: replace dummy versions with normal ones for mini 
* commit '490d3f24fce962c4cb98b1517f0ef1056906d587':
  replace dummy versions with normal ones for mini
 2012-11-27 11:35:54 -08:00
The Android Open Source Project
127c69da09 am c361ae56: am 257fef43: Reconcile with jb-mr1-release - do not merge 
* commit 'c361ae56dc7f3909cb9c1adb2af2602bd0428c7b':
  bump version to 4.2.1
  JOP40D
 2012-11-27 11:35:53 -08:00
Keun young Park
490d3f24fc am d4f8d5e6: replace dummy versions with normal ones for mini 
* commit 'd4f8d5e64950eb114993a9de975e1519e3509d43':
  replace dummy versions with normal ones for mini
 2012-11-27 11:31:50 -08:00
The Android Open Source Project
c361ae56dc am 257fef43: Reconcile with jb-mr1-release - do not merge 
* commit '257fef430806408dbaca2708018b144d430fbdef':
  bump version to 4.2.1
  JOP40D
 2012-11-27 11:31:33 -08:00
Keun young Park
d4f8d5e649 replace dummy versions with normal ones for mini 
- no need to hide these UIs any more.
- dummy versions will be removed from the default manifest as well.

Change-Id: I7cebf5bfae65d2e50c9122735fd4e537f5858bec
 2012-11-27 10:54:17 -08:00
The Android Open Source Project
76828ed645 am a2314e43: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge 
* commit 'a2314e433e3383b6fdaff6dedac1b314c494cd09':
 2012-11-27 08:09:14 -08:00
The Android Open Source Project
a2314e433e Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
 2012-11-27 08:06:10 -08:00
The Android Open Source Project
257fef4308 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911
 2012-11-27 07:33:15 -08:00
The Android Automerger
cc862f246e JDP57B 2012-11-26 12:23:23 -08:00
The Android Automerger
c87917eb8d merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-26 12:22:55 -08:00
The Android Automerger
14eee53ca4 JDP57 2012-11-26 11:29:42 -08:00
The Android Automerger
92ad3fdc4f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-26 11:28:48 -08:00
Ying Wang
be09a520c5 am 71958cca: Merge "Establish explicit dependency on selinux file_contexts." 
* commit '71958cca5d5d5b569a2bb2ad2a4baf53045334e9':
  Establish explicit dependency on selinux file_contexts.
 2012-11-21 12:22:23 -08:00
Ying Wang
71958cca5d Merge "Establish explicit dependency on selinux file_contexts." 2012-11-21 11:10:32 -08:00
Ying Wang
9362c7ffdd Establish explicit dependency on selinux file_contexts. 
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
 2012-11-21 11:09:45 -08:00
The Android Automerger
2b63490401 JDP50B 2012-11-19 16:50:51 -08:00
The Android Automerger
c5a153925f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-19 16:50:33 -08:00
The Android Automerger
8035374142 JDP50 2012-11-19 16:13:54 -08:00
The Android Automerger
09446191ed merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-19 16:12:53 -08:00
Ed Heyl
d4382dd07e bump version to 4.2.1 
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
 2012-11-19 16:04:18 -08:00
The Android Automerger
476750c763 JOP40D 2012-11-19 16:03:54 -08:00
The Android Automerger
5a149026e6 JDP47D 2012-11-19 15:44:50 -08:00
Jean-Baptiste Queru
136383549f Merge f7306051c1 
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
 2012-11-19 15:08:59 -08:00
Ed Heyl
f7306051c1 am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1 
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
  bump version to 4.2.1
 2012-11-19 14:29:37 -08:00
Ed Heyl
0ddeb0ccc1 am efcc8b1c: bump version to 4.2.1 
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
  bump version to 4.2.1
 2012-11-19 14:26:49 -08:00
Ed Heyl
efcc8b1c79 bump version to 4.2.1 
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
 2012-11-19 14:20:48 -08:00
Jean-Baptiste Queru
9d9def1b18 resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge 
Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173
 2012-11-19 10:57:48 -08:00
Jean-Baptiste Queru
4749c6e3e2 Merge "build_id: change to OPENMASTER" 2012-11-19 09:23:42 -08:00
Chirayu Desai
6d492971dd build_id: change to OPENMASTER 
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
 2012-11-18 14:09:34 +05:30
The Android Automerger
cd540e9a59 JDP47C 2012-11-16 17:23:04 -08:00
The Android Automerger
9f8ccf3e95 JDP47B 2012-11-16 17:01:05 -08:00
Ben Cheng
bf031a2586 am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*." 
* commit '17c679d07380b0a4045045fd5d8e56111edf3fbd':
  [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
 2012-11-16 16:23:02 -08:00
Ben Cheng
17c679d073 Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*." 2012-11-16 15:48:44 -08:00
Ben Cheng
8bc4c438bd [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*. 
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.

Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
 2012-11-16 13:29:13 -08:00
The Android Automerger
30c4cabb3a JDP47 2012-11-16 11:32:14 -08:00
Scott Main
691369bd6e am 287d1e42: am 6a040270: am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev 
* commit '287d1e42b48d74d3cba1d362d6379cd5ddcd0de4':
  docs: revise message when api level for docs is too low; make the message appear on package pages as well
 2012-11-16 10:52:05 -08:00
Scott Main
287d1e42b4 am 6a040270: am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev 
* commit '6a0402701ee9672ef57f3049c3e6d7f5c01095b6':
  docs: revise message when api level for docs is too low; make the message appear on package pages as well
 2012-11-16 10:48:50 -08:00
Scott Main
6a0402701e am 34a4b823: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev 
* commit '34a4b8239e25103eb796dabd046d821942706b9f':
  docs: revise message when api level for docs is too low; make the message appear on package pages as well
 2012-11-16 10:45:44 -08:00
Scott Main
34a4b8239e Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev 2012-11-16 10:43:23 -08:00
Scott Main
8f24ca8e3b docs: revise message when api level for docs is too low; 
make the message appear on package pages as well

Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
 2012-11-16 10:34:22 -08:00
Guang Zhu
fdf573e4e0 am 06b57cef: am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1 
* commit '06b57cefeaadd0e2f02a5c8a8679884366f4345e':
  DO NOT MERGE: change build id to JB MR1.1
 2012-11-15 18:00:23 -08:00
Guang Zhu
06b57cefea am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1 
* commit 'f0d4d8f32934df6dc859e2b668d436d67b388cd2':
  DO NOT MERGE: change build id to JB MR1.1
 2012-11-15 17:57:58 -08:00
Guang Zhu
f0d4d8f329 DO NOT MERGE: change build id to JB MR1.1 
Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on

Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e
 2012-11-15 17:47:53 -08:00
Scott Main
932682e619 am 9ade5e79: am 1f0850ee: am 11ac05bb: docs: add script for 32/64-bit bundle downloads 
* commit '9ade5e79870f077d1b99a03cddde1adecfa3236c':
  docs: add script for 32/64-bit bundle downloads
 2012-11-15 15:26:16 -08:00