tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22682 commits 1 branch 0 tags 119 MiB
Commit graph

22682 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ying Wang
454bcff255 Add back Java resources to apk without Java code. 
With commit 33360dd569 we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.

(cherry-picked from commit 8b27d1879c)

Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
 2015-03-27 11:30:51 -07:00
Ying Wang
e01d2ab927 Merge "Add back Java resources to apk without Java code." 2015-03-27 18:17:12 +00:00
Nicholas Sauer
973808493e Merge "Remove mms-common from tiny and minimal builds to fix the pdk build." 2015-03-27 18:16:22 +00:00
Nicholas Sauer
d7af937a03 Merge "Add required projects to pdk build on master." 2015-03-27 18:16:04 +00:00
Ying Wang
8b27d1879c Add back Java resources to apk without Java code. 
With commit 33360dd569 we moved Java
resource packaging forward to creation of the jar file. But the Java
resource packaging will be skipped if a module has no Java code at all.
(The build system does support building an apk without Java code.)
In this change we add back the Java resources directly to the built apk
when the apk has no Java code.

Bug: 19947218
Change-Id: I0e1a65a9cbe656974f8ef3923b2f15e9efa5feb9
 2015-03-27 11:15:17 -07:00
Nicholas Sauer
52b0026f90 Merge "Add classes.jack to the pdk build" 2015-03-27 18:02:42 +00:00
Nicholas Sauer
e4f3956252 Remove mms-common from tiny and minimal builds to fix the pdk build. 
mms-common was replaced with telephony-common over several CLs including
ag/496311. the current mms-common project is merely a dummy class used
to satisfy legacy build targets. i confirmed with ywen@ that it is no
longer needed.

Change-Id: I70302abe4d1312847341bbda4976c489af2e32e3
 2015-03-27 17:54:08 +00:00
Ying Wang
b6b83e9f99 am 8853f518: am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places" 
* commit '8853f5181b1ae1682d9433c28e120f25f63a4721':
  MKBOOTIMG override were missing in two places
 2015-03-27 17:15:46 +00:00
Ying Wang
8853f5181b am 55adb5a3: am 1b23b33d: Merge "MKBOOTIMG override were missing in two places" 
* commit '55adb5a380f801038c00b2e169d33b6da93dfacc':
  MKBOOTIMG override were missing in two places
 2015-03-27 16:59:35 +00:00
Ying Wang
55adb5a380 am 1b23b33d: Merge "MKBOOTIMG override were missing in two places" 
* commit '1b23b33d92f32626584153739308e9147d1541bd':
  MKBOOTIMG override were missing in two places
 2015-03-27 16:52:49 +00:00
Ying Wang
1b23b33d92 Merge "MKBOOTIMG override were missing in two places" 2015-03-27 16:47:15 +00:00
Nicholas Sauer
1b2637e216 Add required projects to pdk build on master. 
Added:
-android.test.runner_intermediates
-android-common_intermediates
-bouncycastle_intermediates
-conscrypt_intermediates
-okhttp_intermediates

Removed:
-mms-common_intermediates (which was deprecated)

Also, alphabetize the list.

Change-Id: Ida5ef79b7176edfe006f50d224bcd64b75843832
 2015-03-27 09:28:45 -07:00
Nicholas Sauer
c2400c3b85 Add classes.jack to the pdk build 
Change-Id: I66ce6681976526b35f08cfe9b23bf1a3f12bccc6
 2015-03-27 07:58:56 -07:00
Bart Sears
921a5f8940 am c3868ae3: (-s ours) resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp 
* commit 'c3868ae37130a6c1c1a650d78bc26f394439d796':
  DO NOT MERGE - Bump version to 5.1.1
 2015-03-27 01:25:58 +00:00
Ying Wang
879c3bf31e am 1c10f075: am abba8a91: am fcf0b138: am ad54a4da: Add selinux and verity support to custom image generation. 
* commit '1c10f0757294d5d46c2e4d8b17da230715897ba6':
 2015-03-27 01:09:13 +00:00
The Android Automerger
c2ed36af0e am 0376271d: am c3196186: (-s ours) am 91fbe4de: "LKY80" 
* commit '0376271da3a79de0c2ff08594358c9551e265d24':
  "LKY80"
 2015-03-27 01:09:12 +00:00
Bart Sears
c3868ae371 resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp 
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
 2015-03-26 18:03:17 -07:00
Ying Wang
1c10f07572 am abba8a91: am fcf0b138: am ad54a4da: Add selinux and verity support to custom image generation. 
* commit 'abba8a9117682f064dcc5c9ffb71fe38352a7918':
 2015-03-27 00:52:58 +00:00
The Android Automerger
0376271da3 am c3196186: (-s ours) am 91fbe4de: "LKY80" 
* commit 'c3196186383e9071753ef50108dbb1f3eb73ecce':
  "LKY80"
 2015-03-27 00:52:57 +00:00
Bart Sears
6d607ee7b0 am 1ded630d: am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1 
* commit '1ded630dec3ea9450c702d7250f0807af7c47cbb':
  DO NOT MERGE - Bump version to 5.1.1
 2015-03-27 00:43:41 +00:00
Ying Wang
abba8a9117 am fcf0b138: am ad54a4da: Add selinux and verity support to custom image generation. 
* commit 'fcf0b1383999ce1da2ee9117884e31ca6620253b':
 2015-03-27 00:43:40 +00:00
Bart Sears
1ded630dec am 1c3bf5c3: DO NOT MERGE - Bump version to 5.1.1 
* commit '1c3bf5c39d281be4b437bc1a367c49b72c6e10b9':
  DO NOT MERGE - Bump version to 5.1.1
 2015-03-27 00:35:28 +00:00
Ying Wang
fcf0b13839 am ad54a4da: Add selinux and verity support to custom image generation. 
* commit 'ad54a4dab520d84f76c9ad6a83be92b5563de24e':
  Add selinux and verity support to custom image generation.
 2015-03-27 00:33:25 +00:00
Ying Wang
ac1da77e65 am e6b9f286: am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails" 
* commit 'e6b9f2869110a35316022c639bf3d932034783d3':
  Fix: exit code is 0 even when check-boot-jars.py fails
 2015-03-26 23:51:07 +00:00
Ying Wang
e6b9f28691 am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails" 
* commit 'bc9ade722f2fe2d4dcc71931cdfd62661d822027':
  Fix: exit code is 0 even when check-boot-jars.py fails
 2015-03-26 23:37:47 +00:00
Ying Wang
bc9ade722f am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails" 
* commit 'd5415dc778abffdf7a9abba52b093da7a20496be':
  Fix: exit code is 0 even when check-boot-jars.py fails
 2015-03-26 23:30:42 +00:00
Ying Wang
d5415dc778 Merge "Fix: exit code is 0 even when check-boot-jars.py fails" 2015-03-26 23:25:32 +00:00
Baligh Uddin
6c0618976c Merge "Add bootsigner path as an option" 2015-03-26 23:03:13 +00:00
The Android Automerger
59fb4fb6d6 am b595d5a3: am a2ef9dd1: am 1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 
* commit 'b595d5a330dc349888e8fe155f4171bcd8a2845f': (40 commits)
  "LKY79"
  "LKY78"
  "LKY77"
  "LKY76"
  "LKY75"
  "LKY73"
  "LKY72"
  "LKY71"
  "LKY70"
  "LKY69"
  "LKY68"
  "LKY66"
  "LKY65"
  "LKY64"
  "LKY63"
  "LKY62"
  LKY61B
  "LKY61"
  "LKY59"
  "LKY58"
  ...
 2015-03-26 21:24:19 +00:00
The Android Automerger
b595d5a330 am a2ef9dd1: am 1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 
* commit 'a2ef9dd1f90b8d090ec30a0e1af8322e1438ba10': (40 commits)
  "LKY79"
  "LKY78"
  "LKY77"
  "LKY76"
  "LKY75"
  "LKY73"
  "LKY72"
  "LKY71"
  "LKY70"
  "LKY69"
  "LKY68"
  "LKY66"
  "LKY65"
  "LKY64"
  "LKY63"
  "LKY62"
  LKY61B
  "LKY61"
  "LKY59"
  "LKY58"
  ...
 2015-03-26 21:09:39 +00:00
The Android Automerger
c319618638 am 91fbe4de: "LKY80" 
* commit '91fbe4de4628cc993e8fe20d1cd4c84805ea61c7':
  "LKY80"
 2015-03-26 21:00:05 +00:00
The Android Automerger
a2ef9dd1f9 am 1a10d739: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 
* commit '1a10d739a79721ec8154a28884746ce472104777': (40 commits)
  "LKY79"
  "LKY78"
  "LKY77"
  "LKY76"
  "LKY75"
  "LKY73"
  "LKY72"
  "LKY71"
  "LKY70"
  "LKY69"
  "LKY68"
  "LKY66"
  "LKY65"
  "LKY64"
  "LKY63"
  "LKY62"
  LKY61B
  "LKY61"
  "LKY59"
  "LKY58"
  ...
 2015-03-26 21:00:01 +00:00
David Riley
1c7151876a Merge "Add support to sign boot images with vboot." 2015-03-26 20:22:22 +00:00
Ying Wang
0137da4019 am 52ea2066: am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined." 
* commit '52ea2066a1c3aedf44e3f64bfe1e4db80707e98f':
  Support to build image of root file system with /system and ramdisk combined.
 2015-03-26 18:19:20 +00:00
Richard Uhler
f9910756dd am c801deac: am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory." 
* commit 'c801deac20c6944095e2316bb4b97b3dc3e11446':
  Store odex files in oat/<isa>/ directory.
 2015-03-26 18:19:19 +00:00
Ying Wang
52ea2066a1 am abc748c1: am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined." 
* commit 'abc748c11cbba71a99f306d318c74b5336b28730':
  Support to build image of root file system with /system and ramdisk combined.
 2015-03-26 17:57:22 +00:00
David Riley
17be3d3921 Add support to sign boot images with vboot. 
Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867
Signed-off-by: David Riley <davidriley@google.com>
(cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
 2015-03-26 17:54:40 +00:00
Ying Wang
abc748c11c am 6ff1b035: Merge "Support to build image of root file system with /system and ramdisk combined." 
* commit '6ff1b0357289c1ef1a7aa9294aae748dacb69866':
  Support to build image of root file system with /system and ramdisk combined.
 2015-03-26 17:50:10 +00:00
bohu
bb49bc5417 Merge "Add fingerprint HAL to emulator system images" 2015-03-26 17:39:54 +00:00
Ying Wang
6ff1b03572 Merge "Support to build image of root file system with /system and ramdisk combined." 2015-03-26 17:36:07 +00:00
Ying Wang
a2292c94d1 Support to build image of root file system with /system and ramdisk combined. 
Added support to build system.img that combines contents of /system and
the ramdisk, and can be mounted at the root of the file system.
To enable this feature, define BoardConfig.mk variable:
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

Ideally we would just change TARGET_OUT (the path of the staging system
directory) to under TARGET_ROOT_OUT. But at this point many places in
the build system assume TARGET_OUT is independent of TARGET_ROOT_OUT and
we can't make it easily configurable.
Instead this implementation takes the least intrusive approach:
We don't change TARGET_OUT or TARGET_ROOT_OUT. We just assemble a
temporary staging directory that contains contents of both TARGET_OUT
and TARGET_ROOT_OUT, in build_image.BuildImage() of
tools/releasetools/build_image.py.
When build_image.py is directly called from the makefile, we pass in the
parameters from the global dictionary; when build_image.BuildImage() is
called from add_img_to_target_files.py, we need to override values to
point to files extracted from the target_files zip file.
We need to combine the fs_config files of both /system and ramdisk,
when fs_config is enabled.

Also this change refactored build_image.BuildImage() by moving the extra
parameters to the image property dictionary.

(cherry-picked from commit 0eabd4f2c5)

Bug:19868522
Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
 2015-03-26 10:35:00 -07:00
Ying Wang
e11702b219 Merge "Support to build image of root file system with /system and ramdisk combined." 2015-03-26 17:34:00 +00:00
bohu
a2005ae47d Add fingerprint HAL to emulator system images 
This will build fingerprint.goldfish.so and fingerprint.ranchu.so
HALs for emulator system images and put them into the hw/
directory.

Change-Id: I6959d4b8e99ea0476c324c01ff05e44716ad8fa1
 2015-03-26 10:16:42 -07:00
Neil Fuller
56128c5178 Addition of a CTS suite for tzdata update code 
Bug: 19941636
Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
 2015-03-26 15:18:19 +00:00
Richard Uhler
c801deac20 am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory." 
* commit '74b1105102ea00a30c516a06f8c5036d6ce44522':
  Store odex files in oat/<isa>/ directory.
 2015-03-26 15:11:26 +00:00
Richard Uhler
74b1105102 am e7173cee: Merge "Store odex files in oat/<isa>/ directory." 
* commit 'e7173cee108fe82b0469c456f69fe5a4160d5192':
  Store odex files in oat/<isa>/ directory.
 2015-03-26 15:04:43 +00:00
Richard Uhler
e7173cee10 Merge "Store odex files in oat/<isa>/ directory." 2015-03-26 14:57:33 +00:00
Jiyong Park
eb745aaf74 Fix: exit code is 0 even when check-boot-jars.py fails 
Fix the bug that build is still success when boot jars contain
non-whitelisted classes. Now, check-boot-jars.py correctly
finishes with exit code 1 when non-whitelisted classes are found.

Change-Id: Id5c80ef9fdb70213d878d569f6033be2c9eb90d3
 2015-03-26 13:25:06 +09:00
Bart Sears
1c3bf5c39d DO NOT MERGE - Bump version to 5.1.1 
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
 2015-03-25 21:04:38 -07:00
Stephen Hines
f68002187a Don't warn on definition of possibly reserved identifiers. 
Change-Id: Icfcfa94aac0503c97dee0ff4d0cd49107201526d
 2015-03-25 17:28:57 -07:00