StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,927 Commits 1 Branch 0 Tags
df7afb47d8d69f53316218dd4b0510aa8201ce7c
Commit Graph

21927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
3cc6a0f22f Merge "Addition of a CTS suite for tzdata update code" 2015-03-31 08:30:51 +00:00
Ying Wang
383cc39285 am 62086971: am d64b853a: Merge "Bump generic_mips64 system partition size." 
* commit '62086971c0616c325fd80ef172de1478ade52fbc':
  Bump generic_mips64 system partition size.
 2015-03-31 00:19:24 +00:00
Ying Wang
62086971c0 am d64b853a: Merge "Bump generic_mips64 system partition size." 
* commit 'd64b853a6d45d11e1f892ad02c0a653e1b5b8663':
  Bump generic_mips64 system partition size.
 2015-03-31 00:13:39 +00:00
Ying Wang
d64b853a6d Merge "Bump generic_mips64 system partition size." 2015-03-31 00:09:07 +00:00
Duane Sand
e53cf413e1 Bump generic_mips64 system partition size. 
Fix broken mips64 build via 20% increase.

Change-Id: Ie30418c6fc7cf8810139abe53537ef8259a49a2f
 2015-03-30 17:02:00 -07:00
Dan Albert
146366bfb2 am b6339d74: am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice." 
* commit 'b6339d74fe575aa9e824ebb593c3064555a7af28':
  Fix up a few callers of GetTypeAndDevice.
 2015-03-28 02:24:39 +00:00
Dan Albert
b6339d74fe am f1a8c8c5: Merge "Fix up a few callers of GetTypeAndDevice." 
* commit 'f1a8c8c5de090221615bf1934e82e1fa9afc54b0':
  Fix up a few callers of GetTypeAndDevice.
 2015-03-28 02:20:24 +00:00
Dan Albert
f1a8c8c5de Merge "Fix up a few callers of GetTypeAndDevice." 2015-03-28 02:15:43 +00:00
Dan Albert
ebb19aa01a Fix up a few callers of GetTypeAndDevice. 
Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7
 2015-03-27 19:11:53 -07:00
Dan Albert
ee8323b629 Fix bad merge. 
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
 2015-03-27 23:50:31 +00:00
Chih-hung Hsieh
29b415aa77 am 1e9b11f4: am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang" 
* commit '1e9b11f4b15982896a85cc70c25f6632395b4e29':
  Allow -mcpu=cortex-a15 for clang
 2015-03-27 23:26:15 +00:00
Chih-hung Hsieh
1e9b11f4b1 am d63c78e0: Merge "Allow -mcpu=cortex-a15 for clang" 
* commit 'd63c78e058da1418db133f62df4ace6f8109965b':
  Allow -mcpu=cortex-a15 for clang
 2015-03-27 23:17:43 +00:00
Chih-hung Hsieh
d63c78e058 Merge "Allow -mcpu=cortex-a15 for clang" 2015-03-27 22:33:04 +00:00
Dan Albert
eecf00db59 resolved conflicts for merge of 4c32aa3d to lmp-mr1-dev-plus-aosp 
Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7
 2015-03-27 14:37:14 -07:00
Ying Wang
f6dfd7b608 am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code." 
* commit 'ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9':
  Add back Java resources to apk without Java code.
 2015-03-27 21:09:39 +00:00
Dan Albert
4c32aa3d0e am 99e22a57: Merge "Make releasetools pylint clean." 
* commit '99e22a57d0b186cb853d757a058318a8be78918b':
  Make releasetools pylint clean.
 2015-03-27 18:47:32 +00:00
Ying Wang
ddc5a8f78c am 8ffec13d: Merge "Add back Java resources to apk without Java code." 
* commit '8ffec13d9b3ea46a5aea1837c1184e67a908f1ef':
  Add back Java resources to apk without Java code.
 2015-03-27 18:47:31 +00:00
Dan Albert
99e22a57d0 Merge "Make releasetools pylint clean." 2015-03-27 18:40:02 +00:00
Ying Wang
8ffec13d9b Merge "Add back Java resources to apk without Java code." 2015-03-27 18:32:00 +00:00
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
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
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
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
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
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
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
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
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
Christopher Ferris
9226f8fc3b am 07aa4c1f: am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2."" 
* commit '07aa4c1feea3e16a99f082b71a631b20ddb8dddf':
  Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
 2015-03-25 18:58:54 +00:00
Ying Wang
335b191800 am 5a8f7067: am e9b15e2c: Merge "Switch x86 and x86_64 to 4.9. Attempt #2." 
* commit '5a8f70678b17e8628abcac8fc7c3b31ebd4dffc3':
  Switch x86 and x86_64 to 4.9. Attempt #2.
 2015-03-25 18:58:52 +00:00
Christopher Ferris
07aa4c1fee am a45223b6: Merge "Revert "Switch x86 and x86_64 to 4.9. Attempt #2."" 
* commit 'a45223b63566d8496250ae797778a4d16ee81419':
  Revert "Switch x86 and x86_64 to 4.9. Attempt #2."
 2015-03-25 18:50:10 +00:00