openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
24,609 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

24609 Commits

Author SHA1 Message Date
Paul Miller 450c53ace6 am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider" 
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
  Replace Browser with Browser2 and BookmarkProvider
 2015-08-04 23:35:33 +00:00
Paul Miller fa977ff366 am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider" 
* commit '09185f5a8f943aeac3d6ace37a73870f5eedc6f4':
  Replace Browser with Browser2 and BookmarkProvider
 2015-08-04 23:26:56 +00:00
Paul Miller 09185f5a8f Merge "Replace Browser with Browser2 and BookmarkProvider" 2015-08-04 23:20:29 +00:00
Ying Wang 82407825c3 am d2d30242: am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master 
* commit 'd2d3024292278a0a0723c901bee71c362735d6b1':
  Ignore .*.java files when collecting .java files.
 2015-08-04 20:55:15 +00:00
Ying Wang d2d3024292 am bd555f15: resolved conflicts for merge of d86f39ca to stage-aosp-master 
* commit 'bd555f1523ec3faafe1e3c6cefce9fe0c96090c1':
  Ignore .*.java files when collecting .java files.
 2015-08-04 20:42:56 +00:00
Ying Wang bd555f1523 resolved conflicts for merge of d86f39ca to stage-aosp-master 
Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0
 2015-08-04 13:36:07 -07:00
Ying Wang d86f39cab7 Merge "Ignore .*.java files when collecting .java files." 2015-08-04 19:52:06 +00:00
Ying Wang 4aedea90e8 Ignore .*.java files when collecting .java files. 
Bug: 22934689
Change-Id: I6c9cc8f37d09eb190946e596e5d1ba0c3b318088
 2015-08-04 12:46:13 -07:00
Ying Wang 082b8ecb7b am f2ee86d1: am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit 'f2ee86d1712edf1c5b1b5b920883b037c661ab4f':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:37:08 +00:00
Ying Wang f2ee86d171 am 5c78a488: am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit '5c78a488d0b7d293c254493a9fc5fc71bc50b011':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:28:00 +00:00
Ying Wang 0a0e6eae3f Build static ckati on Linux. 
Bug: 22798670
Change-Id: I3aaf127627c1c478ab3af2549e49506d4d1f19df
 2015-08-04 12:23:27 -07:00
Ying Wang 5c78a488d0 am fd43aa8a: Merge "Fix writing clean_steps.mk in the first build." 
* commit 'fd43aa8a02d8415121694b4edd15ea8d549a7d3d':
  Fix writing clean_steps.mk in the first build.
 2015-08-04 19:21:38 +00:00
Ying Wang fd43aa8a02 Merge "Fix writing clean_steps.mk in the first build." 2015-08-04 19:14:57 +00:00
Ying Wang eadaa954ce Fix writing clean_steps.mk in the first build. 
Change-Id: Ieddc799f38e5d1522e329e8300bd9f49c26c70ae
 2015-08-04 12:11:54 -07:00
Ying Wang 23d8c546cc am cf3a0c52: am 32350fc5: am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG." 
* commit 'cf3a0c52acc2e431294b927bc8923677f807794c':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:54:49 +00:00
Ying Wang 27c9e3ea48 am dc6d2ada: am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit 'dc6d2adaa851386ee01036db9a00912bd29a5115':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:54:48 +00:00
Ying Wang cf3a0c52ac am 32350fc5: am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG." 
* commit '32350fc547569de75045171eb37e7feac16e93fd':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:47:26 +00:00
Ying Wang dc6d2adaa8 am 60df3444: am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '60df344458f75ed9100e03f6012a73daf52d0807':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:45:41 +00:00
Ying Wang 60df344458 am 0247fe72: am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '0247fe72c05eb27ffb20f14d4b05458bb8641a38':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:36:32 +00:00
Ying Wang 0247fe72c0 am 16d0b4cf: am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '16d0b4cff1b643ee6bb70a3cf4541f34c4bc2210':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:28:49 +00:00
Ying Wang 16d0b4cff1 am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:20:54 +00:00
Ying Wang 32350fc547 am 5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG." 
* commit '5c3adca4011db8fd98a3b7beab76b5b02cbab063':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:18:48 +00:00
Ying Wang 5c3adca401 Merge "Don't prepend CC_WRAPPER to CLANG." 2015-08-03 21:13:37 +00:00
Ying Wang 3e3d7b5ce5 Don't prepend CC_WRAPPER to CLANG. 
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
(cherry-pick from commit 66c8e8c756)
 2015-08-03 14:08:54 -07:00
Ying Wang 66c8e8c756 Don't prepend CC_WRAPPER to CLANG. 
We have deferred the CC_WRAPPER prepending to binary.mk per module.

Bug: 22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
 2015-08-03 14:06:58 -07:00
Ying Wang 292a528f11 am 178b20db: am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build." 
* commit '178b20dbf4ddb3b32eb2230f41aca25c138b632f':
  Build 64-bit host tools in Linux/Mac SDK build.
 2015-08-03 18:08:54 +00:00
Daniel Rosenberg 6344247985 am 0f49fed7: am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery" 
* commit '0f49fed7cfcb08221e91f1a6a9934bfbbde970cf':
  build: core: Fix issue in recovery
 2015-08-03 18:08:53 +00:00
Daniel Rosenberg 25b1afe4a6 am 7d3ad604: am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory" 
* commit '7d3ad6040a31c417eae10e12ab990f7f628239ad':
  Add support for system images that contain the root directory
 2015-08-03 18:08:52 +00:00
Daniel Rosenberg 85e6106db7 am 68fd2113: am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image" 
* commit '68fd21137b09523ebaa3748e57d7eedd0d0ec2ef':
  Add ro.build.system_root_image
 2015-08-03 18:08:50 +00:00
Ying Wang 178b20dbf4 am ede3e310: am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build." 
* commit 'ede3e3103565175fc15b76cd6f9daf7e2b93393b':
  Build 64-bit host tools in Linux/Mac SDK build.
 2015-08-03 18:02:04 +00:00
Daniel Rosenberg 0f49fed7cf am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery" 
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
 2015-08-03 17:57:24 +00:00
Daniel Rosenberg 7d3ad6040a am b139ae07: am 22354d3c: Merge "Add support for system images that contain the root directory" 
* commit 'b139ae078c8b2598889c2fde1a39a9d64f27dc62':
  Add support for system images that contain the root directory
 2015-08-03 17:57:23 +00:00
Daniel Rosenberg 68fd21137b am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image" 
* commit '545f226db0978639aba41f16f623a395dad4209c':
  Add ro.build.system_root_image
 2015-08-03 17:56:45 +00:00
Dianne Hackborn bf8b57b45f am cdbcce02: (-s ours) am 969016a3: am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev 
* commit 'cdbcce029c03ee025aecb669bd99cb4eeae7cf69':
  Remove M codename, version number is 6.0.
 2015-08-01 17:52:25 +00:00
Ying Wang ede3e31035 am 2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build." 
* commit '2c0c1e56dbbaa3abf1d25796c94d6a31594b307e':
  Build 64-bit host tools in Linux/Mac SDK build.
 2015-08-01 17:30:34 +00:00
Ying Wang 2c0c1e56db Merge "Build 64-bit host tools in Linux/Mac SDK build." 2015-08-01 17:23:20 +00:00
Dianne Hackborn cdbcce029c am 969016a3: am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev 
* commit '969016a37c7f7894d110c6855b2cc364bb37690b':
  Remove M codename, version number is 6.0.
 2015-08-01 17:03:34 +00:00
Dianne Hackborn 969016a37c am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev 
* commit 'f4dbf25a6eaa5de12f33f60d8161ac87c1388173':
  Remove M codename, version number is 6.0.
 2015-08-01 16:51:31 +00:00
Dianne Hackborn f4dbf25a6e am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev 
* commit '4b4244cb03bb6f5339859c4631717fe0ddeec4e8':
  Remove M codename, version number is 6.0.
 2015-08-01 16:34:31 +00:00
Dan Albert 87c6d4a7db am c9fca90f: am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH." 
* commit 'c9fca90f4fb44887bde4c2e3671dc0db21c0d6e8':
  Add system/core to the PYTHONPATH.
 2015-08-01 15:57:28 +00:00
Gina Dimino 3288753018 am 09516826: am a5bacf6e: am 44c5e346: Merge "Docs: Add Google Feedback link to the footer for SAC pages." 
* commit '09516826f10a07901208c24b42917400242f7a7c':
  Docs: Add Google Feedback link to the footer for SAC pages.
 2015-08-01 15:57:27 +00:00
Dan Albert c9fca90f4f am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH." 
* commit '4982ef9d76d4ca7189e56377a4032d8fe68fd994':
  Add system/core to the PYTHONPATH.
 2015-08-01 15:48:35 +00:00
Gina Dimino 09516826f1 am a5bacf6e: am 44c5e346: Merge "Docs: Add Google Feedback link to the footer for SAC pages." 
* commit 'a5bacf6e0c21c459e94f2e91a40aa60ee05bc382':
  Docs: Add Google Feedback link to the footer for SAC pages.
 2015-08-01 15:48:11 +00:00
Daniel Rosenberg c26fddcc5b am e4fed421: Merge "build: core: Fix issue in recovery" 
* commit 'e4fed421d5939469bf35cd6430300207a0ff4901':
  build: core: Fix issue in recovery
 2015-08-01 00:17:22 +00:00
Daniel Rosenberg b139ae078c am 22354d3c: Merge "Add support for system images that contain the root directory" 
* commit '22354d3c496e2c21f873758d996878e68c2607bb':
  Add support for system images that contain the root directory
 2015-08-01 00:17:21 +00:00
Daniel Rosenberg 545f226db0 am 46afd7f9: Merge "Add ro.build.system_root_image" 
* commit '46afd7f981406e47740c46253aa16af1ab78eb9c':
  Add ro.build.system_root_image
 2015-08-01 00:12:59 +00:00
Daniel Rosenberg e4fed421d5 Merge "build: core: Fix issue in recovery" 2015-08-01 00:10:09 +00:00
Daniel Rosenberg 22354d3c49 Merge "Add support for system images that contain the root directory" 2015-08-01 00:10:02 +00:00
Daniel Rosenberg 46afd7f981 Merge "Add ro.build.system_root_image" 2015-08-01 00:05:05 +00:00
Daniel Rosenberg 7b82656984 build: core: Fix issue in recovery 
Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink

Change-Id: Ie781507b22e4661629840075b274eaab2f712de6
 2015-07-31 16:52:21 -07:00