summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am e6b9f286: am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when ↵Ying Wang2015-03-261-3/+3
|\ | | | | | | | | | | | | check-boot-jars.py fails" * commit 'e6b9f2869110a35316022c639bf3d932034783d3': Fix: exit code is 0 even when check-boot-jars.py fails
| * am bc9ade72: am d5415dc7: Merge "Fix: exit code is 0 even when ↵Ying Wang2015-03-261-3/+3
| |\ | | | | | | | | | | | | | | | | | | check-boot-jars.py fails" * commit 'bc9ade722f2fe2d4dcc71931cdfd62661d822027': Fix: exit code is 0 even when check-boot-jars.py fails
| | * am d5415dc7: Merge "Fix: exit code is 0 even when check-boot-jars.py fails"Ying Wang2015-03-261-3/+3
| | |\ | | | | | | | | | | | | | | | | * commit 'd5415dc778abffdf7a9abba52b093da7a20496be': Fix: exit code is 0 even when check-boot-jars.py fails
| | | * Merge "Fix: exit code is 0 even when check-boot-jars.py fails"Ying Wang2015-03-261-3/+3
| | | |\
| | | | * Fix: exit code is 0 even when check-boot-jars.py failsJiyong Park2015-03-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | am abc748c1: am 6ff1b035: Merge "Support to build image of root file system ↵Ying Wang2015-03-261-1/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | with /system and ramdisk combined." * commit 'abc748c11cbba71a99f306d318c74b5336b28730': Support to build image of root file system with /system and ramdisk combined.
| | * | | am 6ff1b035: Merge "Support to build image of root file system with /system ↵Ying Wang2015-03-261-1/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | and ramdisk combined." * commit '6ff1b0357289c1ef1a7aa9294aae748dacb69866': Support to build image of root file system with /system and ramdisk combined.
| | | * | Support to build image of root file system with /system and ramdisk combined.Ying Wang2015-03-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 0eabd4f2c5fe704d3c3212b45b80775a35b55b1b) Bug:19868522 Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
* | | | | Merge "Add support to sign boot images with vboot."David Riley2015-03-263-1/+20
|\ \ \ \ \
| * | | | | Add support to sign boot images with vboot.David Riley2015-03-263-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I924468fe06f7d38d4fc49c2ae9dfee734fd58867 Signed-off-by: David Riley <davidriley@google.com> (cherry picked from commit 14fb7236c1942a9f5050b3e608a0f5f4cd1cae1d)
* | | | | | am c801deac: am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ ↵Richard Uhler2015-03-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | directory." * commit 'c801deac20c6944095e2316bb4b97b3dc3e11446': Store odex files in oat/<isa>/ directory.
| * | | | am 74b11051: am e7173cee: Merge "Store odex files in oat/<isa>/ directory."Richard Uhler2015-03-261-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '74b1105102ea00a30c516a06f8c5036d6ce44522': Store odex files in oat/<isa>/ directory.
| | * | | am e7173cee: Merge "Store odex files in oat/<isa>/ directory."Richard Uhler2015-03-261-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'e7173cee108fe82b0469c456f69fe5a4160d5192': Store odex files in oat/<isa>/ directory.
| | | * | Merge "Store odex files in oat/<isa>/ directory."Richard Uhler2015-03-261-1/+1
| | | |\ \ | | | | |/ | | | |/|
| | | | * Store odex files in oat/<isa>/ directory.Richard Uhler2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | am 07aa4c1f: am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. ↵Christopher Ferris2015-03-252-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Attempt #2."" * commit '07aa4c1feea3e16a99f082b71a631b20ddb8dddf': Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
| | * | | am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""Christopher Ferris2015-03-252-3/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'a45223b63566d8496250ae797778a4d16ee81419': Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
| | | * | Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2.""Christopher Ferris2015-03-252-3/+3
| | | |\ \
| | | | * | Revert "Switch x86 and x86_64 to 4.9. Attempt #2."Christopher Ferris2015-03-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6fb735b07132b613de1b5b64c5c31a36c4b9ac2d. Change-Id: I64b868cdfb3571de5e8b01e4257b5dfa9ee44d0d
| * | | | | am 5a8f7067: am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."Ying Wang2015-03-252-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5a8f70678b17e8628abcac8fc7c3b31ebd4dffc3': Switch x86 and x86_64 to 4.9. Attempt #2.
| | * | | | am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2."Ying Wang2015-03-252-3/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e9b15e2ccd07bb148b7fd7642658b9b54c0f47d0': Switch x86 and x86_64 to 4.9. Attempt #2.
| | | * | | Merge "Switch x86 and x86_64 to 4.9. Attempt #2."Ying Wang2015-03-252-3/+3
| | | |\ \ \ | | | | |/ /
| | | | * | Switch x86 and x86_64 to 4.9. Attempt #2.Alexander Ivchenko2015-03-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=16407835 Change-Id: I45161bf4701bef4540b51168f771c5e9da8c8750 Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
| * | | | | am 743b9f49: am ad54a4da: Add selinux and verity support to custom image ↵Ying Wang2015-03-232-2/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generation. * commit '743b9f498b68af1c70eec8e7ca7055a9c23ce6f5': Add selinux and verity support to custom image generation.
| | * | | | | Add selinux and verity support to custom image generation.Ying Wang2015-03-232-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 7d51a4029590b58e22071eed919d59a0ff205bef)
* | | | | | | Support to build image of root file system with /system and ramdisk combined.Ying Wang2015-03-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Bug:19868522 Change-Id: Iafc467a0e3427b0d6ad3b575abcc98ddcc9ea0f1
* | | | | | | am 3ba88e7d: am b7fe2e62: am f7683b81: Merge "Clearly explain that 32-bit ↵Brian Carlstrom2015-03-231-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | x86 is not supported" * commit '3ba88e7d2dbc7f4d52202d58614cdcd566539455': Clearly explain that 32-bit x86 is not supported
| * | | | | | am b7fe2e62: am f7683b81: Merge "Clearly explain that 32-bit x86 is not ↵Brian Carlstrom2015-03-201-0/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported" * commit 'b7fe2e622d7a6a696749d5441358b84569de6f75': Clearly explain that 32-bit x86 is not supported
| | * | | | | am f7683b81: Merge "Clearly explain that 32-bit x86 is not supported"Brian Carlstrom2015-03-201-0/+4
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit 'f7683b813a7f71313f3dd1f71be1a8ef9d800ebf': Clearly explain that 32-bit x86 is not supported
| | | * | | | Merge "Clearly explain that 32-bit x86 is not supported"Brian Carlstrom2015-03-201-0/+4
| | | |\ \ \ \
| | | | * | | | Clearly explain that 32-bit x86 is not supportedBrian Carlstrom2015-03-201-0/+4
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Change-Id: I7f352fae8fa3742c61dc74e20aacd32254451bce
* | | | | | | am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from ↵Mathieu Chartier2015-03-231-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interpret-only to verify-at-runtime" * commit '783a632f45fdddaa2073445728db61d2041a3435': Change eng builds from interpret-only to verify-at-runtime
| * | | | | | am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to ↵Mathieu Chartier2015-03-201-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify-at-runtime" * commit '7f91420487936d7916577e163d4f38a4534bb76d': Change eng builds from interpret-only to verify-at-runtime
| | * | | | | am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"Mathieu Chartier2015-03-201-4/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '55fbc49fe1993d87a6a978132c827f316f2be5a7': Change eng builds from interpret-only to verify-at-runtime
| | | * | | | Merge "Change eng builds from interpret-only to verify-at-runtime"Mathieu Chartier2015-03-201-4/+4
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Change eng builds from interpret-only to verify-at-runtimeMathieu Chartier2015-03-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Faster dex2oat -> faster boot after syncing core libraries. Bug: 19762303 Change-Id: Ic266ed9c59829e0e18acc4adc103724cf480de7f
* | | | | | | Add selinux and verity support to custom image generation.Ying Wang2015-03-232-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Turn off Jack warnings by defaultYohann Roussel2015-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24b3135395483b3581d212cb2ab1bb93ba2524d9
* | | | | | | am ad3f2ee0: am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ ↵Dan Albert2015-03-201-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need libs c, m and dl." * commit 'ad3f2ee0dfbd8d63ffa81d4bb126c7d2cfaded2b': Static binaries with libc++ need libs c, m and dl.
| * | | | | | am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ need libs c, m ↵Dan Albert2015-03-201-0/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and dl." * commit 'f1999c8af022d295397d2c1079dbebf362d9ad37': Static binaries with libc++ need libs c, m and dl.
| | * | | | | am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."Dan Albert2015-03-201-0/+5
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '59112a2da30004b20c186e0878148cd6053ae859': Static binaries with libc++ need libs c, m and dl.
| | | * | | | Merge "Static binaries with libc++ need libs c, m and dl."Dan Albert2015-03-201-0/+5
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Static binaries with libc++ need libs c, m and dl.Dan Albert2015-03-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can't be done on the user's end because these libraries all need to be linked after libc++_static. Change-Id: Ib21364e6f43689cf59da31d6f561919731ef8272
* | | | | | | Filter out gcc only flags.Chih-Hung Hsieh2015-03-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are currently used in some vendor projects. Change-Id: Iff30966cba3b2941a8921cc35bb3ed1e4fea0bad
* | | | | | | am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename ↵Mathieu Chartier2015-03-191-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dalvik.vm.usejit to debug.dalvik.vm.usejit"" * commit 'b01a4ca3c838007d2e8f71c01b37f8e878cff686': Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
| * | | | | | am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to ↵Mathieu Chartier2015-03-191-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debug.dalvik.vm.usejit"" * commit '68f6e30521feced2dbd2e1dcb606f9f15cf5ec21': Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
| | * | | | | am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""Mathieu Chartier2015-03-191-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '9682e56a794f2fc68cae00475b7f11927c57b3da': Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
| | | * | | | Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"Mathieu Chartier2015-03-181-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19735273 This reverts commit 3abfcfc17b022a5af9d37403f81fae027ab850b9. Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
* | | | | | Merge "Use java -jar ... instead of java -cp ..."Yohann Roussel2015-03-171-2/+2
|\ \ \ \ \ \
| * | | | | | Use java -jar ... instead of java -cp ...Yohann Roussel2015-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running Jack or Jill. Change-Id: I2127f183f8f033a9d35a7e8247a9432252a58bc8
generated by cgit v1.1 at 2025-01-10 21:09:45 +0000