StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,055 Commits 1 Branch 0 Tags
a0cca8e66ac124c5d78fe35e10ece83c5314734b
Commit Graph

6571 Commits

Author SHA1 Message Date
Per Astrand
cab6699160 MKBOOTIMG override were missing in two places 
The change follows the patten found in "Package OTA" and other places
to allow for overriding the mkbootimg command.

Now pass MKBOOTIMG variable to get make_recovery_patch and add_image_to_target
to use the tool set in BOARD_CUSTOM_MKBOOTIMG for boot/recovery image
generation.

Change-Id: I78533c25e87c2750eb24ac1bf39e4b7ca321a441
 2015-03-25 16:02:50 +01:00
Ying Wang
c85af62429 am 743b9f49: am ad54a4da: Add selinux and verity support to custom image generation. 
* commit '743b9f498b68af1c70eec8e7ca7055a9c23ce6f5':
  Add selinux and verity support to custom image generation.
 2015-03-23 18:02:30 +00:00
Ying Wang
ad54a4dab5 Add selinux and verity support to custom image generation. 
New custom image configuration variables:
- CUSTOM_IMAGE_SELINUX, set to "true" if the image supports selinux.
- CUSTOM_IMAGE_SUPPORT_VERITY, set to "true" if the product supports verity.
- CUSTOM_IMAGE_VERITY_BLOCK_DEVICE

Also changed the staging directory name to the mount point, like we do
for other images built by the build system.

Bug: 19609718
Change-Id: I6bbf06b79eee63e4c77834f2e6f1d5a7f7e00a12
(cherry picked from commit 7d51a40295)
 2015-03-23 17:50:16 +00:00
The Android Automerger
91fbe4de46 "LKY80" 2015-03-21 06:05:46 -07:00
Brian Carlstrom
3ba88e7d2d am b7fe2e62: am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported" 
* commit 'b7fe2e622d7a6a696749d5441358b84569de6f75':
  Clearly explain that 32-bit x86 is not supported
 2015-03-20 22:09:36 +00:00
Brian Carlstrom
b7fe2e622d am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported" 
* commit 'f7683b813a7f71313f3dd1f71be1a8ef9d800ebf':
  Clearly explain that 32-bit x86 is not supported
 2015-03-20 22:02:49 +00:00
Mathieu Chartier
783a632f45 am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime" 
* commit '7f91420487936d7916577e163d4f38a4534bb76d':
  Change eng builds from interpret-only to verify-at-runtime
 2015-03-20 21:58:48 +00:00
Brian Carlstrom
f7683b813a Merge "Clearly explain that 32-bit x86 is not supported" 2015-03-20 21:52:38 +00:00
Mathieu Chartier
7f91420487 am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime" 
* commit '55fbc49fe1993d87a6a978132c827f316f2be5a7':
  Change eng builds from interpret-only to verify-at-runtime
 2015-03-20 21:26:39 +00:00
Mathieu Chartier
55fbc49fe1 Merge "Change eng builds from interpret-only to verify-at-runtime" 2015-03-20 21:19:40 +00:00
Brian Carlstrom
2cd8a74b2d Clearly explain that 32-bit x86 is not supported 
Change-Id: I7f352fae8fa3742c61dc74e20aacd32254451bce
 2015-03-20 12:50:42 -07:00
Mathieu Chartier
62a7cac50d Change eng builds from interpret-only to verify-at-runtime 
Faster dex2oat -> faster boot after syncing core libraries.

Bug: 19762303
Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
 2015-03-20 11:15:20 -07:00
Alexander Ivchenko
6fb735b071 Switch x86 and x86_64 to 4.9. Attempt #2. 
BUG=16407835

Change-Id: I45161bf4701bef4540b51168f771c5e9da8c8750
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
 2015-03-20 17:07:34 +03:00
Dan Albert
ad3f2ee0df am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl." 
* commit 'f1999c8af022d295397d2c1079dbebf362d9ad37':
  Static binaries with libc++ need libs c, m and dl.
 2015-03-20 03:23:48 +00:00
Dan Albert
f1999c8af0 am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl." 
* commit '59112a2da30004b20c186e0878148cd6053ae859':
  Static binaries with libc++ need libs c, m and dl.
 2015-03-20 03:14:17 +00:00
Dan Albert
59112a2da3 Merge "Static binaries with libc++ need libs c, m and dl." 2015-03-20 03:04:20 +00:00
Dan Albert
7955bf0fd6 Static binaries with libc++ need libs c, m and dl. 
Can't be done on the user's end because these libraries all need to be
linked after libc++_static.

Change-Id: Ib21364e6f43689cf59da31d6f561919731ef8272
 2015-03-19 13:05:13 -07:00
Mathieu Chartier
b01a4ca3c8 am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 
* commit '68f6e30521feced2dbd2e1dcb606f9f15cf5ec21':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
 2015-03-19 16:59:02 +00:00
Mathieu Chartier
68f6e30521 am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"" 
* commit '9682e56a794f2fc68cae00475b7f11927c57b3da':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
 2015-03-19 16:51:34 +00:00
Mathieu Chartier
8b11285dd9 Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 
Bug: 19735273

This reverts commit 3abfcfc17b.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
 2015-03-18 19:06:28 -07:00
Richard Uhler
820fe32d46 Store odex files in oat/<isa>/ directory. 
Previously odex files were stored alongside the dex location as:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/<isa>/base.odex

This changes where odex files are stored, adding an "oat" directory:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/oat/<isa>/base.odex

See also the corresponding change in platform/art and
platform/frameworks/native.

Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
 2015-03-18 12:41:31 -07:00
Mathieu Chartier
7b93109e48 am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 
* commit 'd7f3d8ba74c25c80fcb5032e6b59e121e5546f98':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
 2015-03-17 14:41:15 +00:00
Christopher Ferris
e088179677 am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 
* commit '8081a8b5960055c12ad50ba9a8651fe3adb4b370':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
 2015-03-17 14:41:13 +00:00
Mathieu Chartier
d7f3d8ba74 am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit" 
* commit '8ca542f4394affd420271d8df946e199449508e6':
  Rename dalvik.vm.usejit to debug.dalvik.vm.usejit
 2015-03-17 14:32:51 +00:00
Christopher Ferris
8081a8b596 am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 
* commit '13169ccba2d9e11e311babd8fc80f41c610c753e':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"
 2015-03-17 14:32:50 +00:00
Christopher Ferris
13169ccba2 Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9"" 2015-03-17 01:31:16 +00:00
Christopher Ferris
f123057f5e Revert "Switch x86 and x86_64 build to use GCC 4.9" 
This reverts commit 533c7aa6a2.

Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
 2015-03-17 01:29:51 +00:00
Andrew Hsieh
58b2f1e320 am 81f7dee7: am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9" 
* commit '81f7dee74cc436fa47339a884467cc241dd86dc7':
  Switch x86 and x86_64 build to use GCC 4.9
 2015-03-17 00:07:39 +00:00
Andrew Hsieh
81f7dee74c am bf0b6df4: Merge "Switch x86 and x86_64 build to use GCC 4.9" 
* commit 'bf0b6df4c15c2e7bbfd3a8b84d7c627cc3b7127f':
  Switch x86 and x86_64 build to use GCC 4.9
 2015-03-16 23:59:04 +00:00
Andrew Hsieh
bf0b6df4c1 Merge "Switch x86 and x86_64 build to use GCC 4.9" 2015-03-16 23:50:19 +00:00
Mathieu Chartier
3abfcfc17b Rename dalvik.vm.usejit to debug.dalvik.vm.usejit 
Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7
 2015-03-16 16:29:30 -07:00
Ying Wang
2219b1d8ef am efc3a220: am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk" 
* commit 'efc3a22009b15c389041427f8c74f551243b60d0':
  Load cts/build/config.mk after build/core/config.mk
 2015-03-16 19:07:43 +00:00
Ying Wang
efc3a22009 am d73696c1: Merge "Load cts/build/config.mk after build/core/config.mk" 
* commit 'd73696c1fefface6f3d2311d1dead3afae01b048':
  Load cts/build/config.mk after build/core/config.mk
 2015-03-16 19:01:59 +00:00
Ying Wang
f738b3bb9f Load cts/build/config.mk after build/core/config.mk 
So that the cts config.mk can use global variables set by the core build
system config.mk.

Change-Id: I2571564abbb53257eee54485a3357ab1305eb870
(cherry picked from commit bacf5f8008)
 2015-03-16 10:56:03 -07:00
Andrew Hsieh
533c7aa6a2 Switch x86 and x86_64 build to use GCC 4.9 
Change-Id: I41a7650d0e56c820a59c261d16afd6f0b9ec38c2
 2015-03-16 13:17:59 +08:00
Ying Wang
d4ca3b38d9 am 4cbc4b39: am ae61f50a: Support to configure and build multiple custom images. 
* commit '4cbc4b392da57c34626af38a4ea0fe4dc115af57':
  Support to configure and build multiple custom images.
 2015-03-14 00:31:44 +00:00
Ying Wang
ae61f50a68 Support to configure and build multiple custom images. 
Build additional images requested by the product makefile.
This script gives the ability to build multiple additional images and
you can configure what modules/files to include in each image.
1. Define PRODUCT_CUSTOM_IMAGE_MAKEFILES in your product makefile.
   PRODUCT_CUSTOM_IMAGE_MAKEFILES is a list of makefiles.
   Each makefile configures an image.
   For image configuration makefile foo/bar/xyz.mk, the built image
   file name
   will be xyz.img. So make sure they won't conflict.
2. In each image's configuration makefile, you can define variables:
  - CUSTOM_IMAGE_MOUNT_POINT, the mount point, such as "oem", "odm"
    etc.
  - CUSTOM_IMAGE_PARTITION_SIZE
  - CUSTOM_IMAGE_FILE_SYSTEM_TYPE
  - CUSTOM_IMAGE_DICT_FILE, a text file defining a dictionary
    accepted by BuildImage() in tools/releasetools/build_image.py.
  - CUSTOM_IMAGE_MODULES, a list of module names you want to include
    in the image; Not only the module itself will be installed to proper
    path in the image, you can also piggyback additional files/directories
    with the module's LOCAL_PICKUP_FILES.
  - CUSTOM_IMAGE_COPY_FILES, a list of "<src>:<dest>" to be copied to
    the image. <dest> is relativ to the root of the image.

To build all those images, run "make custom_images".

Bug: 19609718
Change-Id: Ic73587e08503a251be27797c7b00329716051927
(cherry picked from commit 5fcf1094f9)
 2015-03-14 00:06:54 +00:00
Dan Albert
78c6a1cb1a am c37d7043: am 3ad14218: Merge "Strip prebuilt shared library by default." 
* commit 'c37d7043e6fde29bf14218c31132dc48a9f7e995':
  Strip prebuilt shared library by default.
 2015-03-13 23:29:06 +00:00
Dan Albert
92b0082275 am e685e849: am 8de543fd: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64" 
* commit 'e685e849c02bb75bf0d9c871e87556472c4fca73':
  Switch NDK libraries to 4.9 for x86_64 and mips64
 2015-03-13 23:29:05 +00:00
Dan Albert
4d45d6d8b0 am b478d625: am 9db3e6c6: Merge "Support "LOCAL_FDO_SUPPORT := always"." 
* commit 'b478d625f2f72440f239ec538fae167ede45f49e':
  Support "LOCAL_FDO_SUPPORT := always".
 2015-03-13 23:29:03 +00:00
Dan Albert
169f16f808 am fd496a64: am c70805ee: Merge "Set up environmental variable PATH before calling releasetools scripts." 
* commit 'fd496a64277e331487048acee586da6ad5d02870':
  Set up environmental variable PATH before calling releasetools scripts.
 2015-03-13 23:29:02 +00:00
Dan Albert
ba64cebf14 am 7c4a3464: am fcd0d98b: Merge "include oem.prop files in otatools_package" 
* commit '7c4a34642aecebb35845345cc86dfe63c86936f5':
  include oem.prop files in otatools_package
 2015-03-13 23:29:00 +00:00
Dan Albert
c37d7043e6 am 3ad14218: Merge "Strip prebuilt shared library by default." 
* commit '3ad14218ccca2c729dfd90a24050e40fc52a56bf':
  Strip prebuilt shared library by default.
 2015-03-13 23:21:25 +00:00
Dan Albert
e685e849c0 am 8de543fd: Merge "Switch NDK libraries to 4.9 for x86_64 and mips64" 
* commit '8de543fdec61cae9eef8e3b3f7a0e5cc4cd0aa70':
  Switch NDK libraries to 4.9 for x86_64 and mips64
 2015-03-13 23:21:24 +00:00
Dan Albert
b478d625f2 am 9db3e6c6: Merge "Support "LOCAL_FDO_SUPPORT := always"." 
* commit '9db3e6c61fe10073a2ed829f1036bc6281767202':
  Support "LOCAL_FDO_SUPPORT := always".
 2015-03-13 23:21:23 +00:00
Dan Albert
fd496a6427 am c70805ee: Merge "Set up environmental variable PATH before calling releasetools scripts." 
* commit 'c70805eef5be3e10003518d24adb083dcd1efbc2':
  Set up environmental variable PATH before calling releasetools scripts.
 2015-03-13 23:21:21 +00:00
Dan Albert
7c4a34642a am fcd0d98b: Merge "include oem.prop files in otatools_package" 
* commit 'fcd0d98b6cedde450a6e4d62df2209d8295752fc':
  include oem.prop files in otatools_package
 2015-03-13 23:21:20 +00:00
Dan Albert
c856bcb9c8 am 4cdf1357: Merge "add otatools-package target" 
* commit '4cdf1357433b407b350517779248e2194c88c3f4':
  add otatools-package target
 2015-03-13 21:10:49 +00:00
Ying Wang
c1729f3602 Strip prebuilt shared library by default. 
Strip prebuilt shared library but not try adding gnu debuglink.
It would fail if you try run the adding gnu debuglink command if a
prebuilt is already stripped.

Bug: 17177288
Change-Id: If5811865715c2437e45fbd329983ef1212ef0109
(cherry picked from commit bfb52a2ec1)
 2015-03-13 11:36:15 -07:00
Przemyslaw Szczepaniak
0e2d00ff1f Switch NDK libraries to 4.9 for x86_64 and mips64 
Android NDK r10b doesn't even provide 4.8 for those
archs.

Change-Id: I10840c6c7bbc0dd9028a794162d021d8b3e6b19a
(cherry picked from commit fabd383bc8)
 2015-03-13 11:36:15 -07:00