p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,213 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

24213 Commits

Author SHA1 Message Date
Tao Bao 91fdd1a321 resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp 
Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777
 2015-08-06 10:57:57 -07:00
Ying Wang 4a368585a5 am a101f558: am ecbc5b40: Merge "Build static ckati on Linux." 
* commit 'a101f55893ecaa59666faa653a926ea49d57212a':
  Build static ckati on Linux.
 2015-08-06 17:55:15 +00:00
Tao Bao 610520ad20 am 40467cbf: Merge "build: Support packaging for system_root_image." 
* commit '40467cbfbbc2a59d9b80f5c5ee97bd1a64bc2858':
  build: Support packaging for system_root_image.
 2015-08-06 17:49:49 +00:00
Ying Wang a101f55893 am ecbc5b40: Merge "Build static ckati on Linux." 
* commit 'ecbc5b401a55ab4e9e0e9cc9bf720044c4d4a829':
  Build static ckati on Linux.
 2015-08-06 17:49:48 +00:00
Tao Bao 40467cbfbb Merge "build: Support packaging for system_root_image." 2015-08-06 17:43:46 +00:00
Tao Bao 62bd479fdf build: Support packaging for system_root_image. 
If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.

Change-Id: I817776ca97194991308b2131d0e34ab136283464
 2015-08-05 16:39:39 -07:00
Tao Bao 7a5bf8a645 releasetools: Support packaging for system_root_image. 
For system images that contain the root directory, we need to find the
root directory at ROOT/ instead of BOOT/RAMDISK/.

Change-Id: Ica345c8b1b03475f8ac6c44fd576045fcf17c882
 2015-08-05 16:28:55 -07:00
Christopher Wiley a3dbe51f42 resolved conflicts for merge of 7d1be400 to mnc-dev-plus-aosp 
Change-Id: Ifc2b669bc573f059f35085d11693ea3d2cac11ec
 2015-08-05 10:18:16 -07:00
Ying Wang ecbc5b401a Merge "Build static ckati on Linux." 2015-08-05 16:43:59 +00:00
Christopher Wiley 7d1be40047 am 5923fcd0: Merge "Add build rules to generate native DBus interfaces" 
* commit '5923fcd02131abfd1bc8f39704edc6c7e8100154':
  Add build rules to generate native DBus interfaces
 2015-08-05 15:46:44 +00:00
Christopher Wiley 5923fcd021 Merge "Add build rules to generate native DBus interfaces" 2015-08-05 15:40:00 +00:00
Paul Miller 15a45a6ea7 am fa977ff3: am 09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider" 
* commit 'fa977ff366f54c6ae244f3ba99e3481f7d29796d':
  Replace Browser with Browser2 and BookmarkProvider
 2015-08-04 23:35:29 +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 6eed5fc703 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:44:58 +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 7d985ffb1e 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:05 +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
Stephen Smalley d3a803e668 build: switch over to file_contexts.bin only 
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.

Depends on
   I75a781100082c23536f70ce3603f7de42408b5ba
   I43806d564b83d57f05f5c36c8eba7b1ff4831b04
   Id560d093440a2aba99cef28c20133b35feebf950
   I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400

Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2015-08-04 14:59:06 -04:00
Richard Haines a65637d230 Update embedded.mk to support file_contexts.bin 
This change supports external/libselinux changes to implement
a PCRE formatted binary file_contexts file.

Change-Id: I75a781100082c23536f70ce3603f7de42408b5ba
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
 2015-08-04 14:53:12 -04:00
Ying Wang 27fa4a30ec 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:29:16 +00:00
Ying Wang c7b8ee0974 am 66c8e8c7: Don\'t prepend CC_WRAPPER to CLANG. 
* commit '66c8e8c756fb1790cac792b32ba2de057c3b1b4e':
  Don't prepend CC_WRAPPER to CLANG.
 2015-08-03 21:21:01 +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 0a1026ce27 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-01 17:35:31 +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
Daniel Rosenberg 1e6ee759b3 am c26fddcc: am e4fed421: Merge "build: core: Fix issue in recovery" 
* commit 'c26fddcc5be8876854fe3b44c0c48a0c47de8c07':
  build: core: Fix issue in recovery
 2015-08-01 00:24:00 +00:00
Daniel Rosenberg 93d8ea20b8 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-01 00:23:58 +00:00
Daniel Rosenberg b7c57cba9f am 545f226d: am 46afd7f9: Merge "Add ro.build.system_root_image" 
* commit '545f226db0978639aba41f16f623a395dad4209c':
  Add ro.build.system_root_image
 2015-08-01 00:18:40 +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
Daniel Rosenberg e6853b0d63 Add support for system images that contain the root directory 
When the root directory is included in system, the assumption that
system is mounted at /system breaks down. Redirect /system to /
in that case.

Change-Id: I8031b32d7cb9ca699c1cc22939e28afce9d1c847
 2015-07-31 16:52:21 -07:00
Daniel Rosenberg 59156a6b7d Add ro.build.system_root_image 
ro.build.system_root_image is true if the root directory is built
into the system image.

Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
 2015-07-31 16:52:21 -07:00
Dan Albert 8405451f90 am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH." 
* commit '4982ef9d76d4ca7189e56377a4032d8fe68fd994':
  Add system/core to the PYTHONPATH.
 2015-07-31 22:31:58 +00:00
Dan Albert 4982ef9d76 am 010f652e: Merge "Add system/core to the PYTHONPATH." 
* commit '010f652ee7a9398f46b1c635c6bd186f7c7f8853':
  Add system/core to the PYTHONPATH.
 2015-07-31 20:54:56 +00:00
Dan Albert 010f652ee7 Merge "Add system/core to the PYTHONPATH." 2015-07-31 20:48:17 +00:00
Dan Albert 515ab1e2d1 Add system/core to the PYTHONPATH. 
There's an adb Python interface now, and system/core needs to be in
the PYTHONPATH for `import adb` to find it.

Change-Id: I712767a2ba96cb017ce5857dc367e4cacf2ec51f
 2015-07-31 13:38:47 -07:00