Commit Graph

38144 Commits

Author SHA1 Message Date
Paul Duffin 3b3bffc0d0 Merge "Add junit/textui/** to the proguard filter" 2017-06-15 09:04:08 +00:00
Nicolas Geoffray 4a0ad4ac61 Add a new PRODUCT variable for forcing 'speed' preopt.
bug: 35872915
Test: build
Change-Id: Idfea3c379a2b1dab30ee94a58ffe86d508f8522f
2017-06-15 09:52:45 +01:00
Paul Duffin 54747a7f09 Add junit/textui/** to the proguard filter
Fixes build breakage caused by having duplicate versions of
a class in the application and in the API. This workaround will
be removed once junit classes have been removed from the API.

Bug: 30188076
Test: make Browser2 ANDROID_FORCE_JACK_ENABLED=disabled
Change-Id: I9a9031d3ef6d82f35413b229d588a605f9ed39dc
2017-06-15 08:42:23 +01:00
Yoshisato Yanagisawa 1cceaef3fc Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f am: cc2ca23b1e
am: 7b691489a8

Change-Id: I1aad4f8b17853308346d62cf70a54d6503ba9675
2017-06-15 07:42:11 +00:00
Yoshisato Yanagisawa 7b691489a8 Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f
am: cc2ca23b1e

Change-Id: Ie7288bc85507008efeed8bf5a3b42ceb2392062b
2017-06-15 07:38:39 +00:00
Yoshisato Yanagisawa cc2ca23b1e Merge "Set JAVAC_WRAPPER if USE_GOMA is set."
am: aa09aa819f

Change-Id: I01f0900fff9e4fb0b1acc09e605a9a0814189a93
2017-06-15 07:35:38 +00:00
Treehugger Robot aa09aa819f Merge "Set JAVAC_WRAPPER if USE_GOMA is set." 2017-06-15 07:28:26 +00:00
Igor Murashkin ca811c825c Merge "core: Move core.oat bootjar definitions into core/config" am: 5e1aa20225 am: db52463bb3
am: 9c57325093

Change-Id: If1ec447b21e277a023b016868db1633379acc5e0
2017-06-15 03:19:07 +00:00
Igor Murashkin 9c57325093 Merge "core: Move core.oat bootjar definitions into core/config" am: 5e1aa20225
am: db52463bb3

Change-Id: I7fe90df0a8dae2fb5aa9f0dbcfc21a77b2700a87
2017-06-15 03:16:07 +00:00
Igor Murashkin db52463bb3 Merge "core: Move core.oat bootjar definitions into core/config"
am: 5e1aa20225

Change-Id: Iede6a5ad12024e083accede4757a4be33d678aee
2017-06-15 03:10:06 +00:00
Igor Murashkin 5e1aa20225 Merge "core: Move core.oat bootjar definitions into core/config" 2017-06-15 03:06:12 +00:00
Igor Murashkin 8c50798243 core: Move core.oat bootjar definitions into core/config
TARGET_CORE_JARS and HOST_CORE_JARS define the minimal
bootclasspath jars necessary to run with dalvikvm/art.

Also refactor PRODUCT_BOOT_JARS to reuse TARGET_CORE_JARS.

(These changes are required to figure out what --bootclasspath_entry
to pass to desugar).

Bug: 36902714
Test: make -j32 && make -j32 build-art-host build-art-target
Change-Id: I620e28be41047a1d501d7f144fe415ee4a0af36f
2017-06-14 10:02:09 -07:00
Paul Duffin 9a8b2f7d96 Merge "Added android.test.mock to PRODUCT_PACKAGES" am: 87b69b97f3 am: b349e09a18
am: f170ad5f55

Change-Id: I8f7a8633714905672694f5b44ec3f3209bbbea6f
2017-06-14 11:17:13 +00:00
Paul Duffin f170ad5f55 Merge "Added android.test.mock to PRODUCT_PACKAGES" am: 87b69b97f3
am: b349e09a18

Change-Id: I242537e012490770a7a3bbdd235dc6016984804b
2017-06-14 11:14:43 +00:00
Paul Duffin b349e09a18 Merge "Added android.test.mock to PRODUCT_PACKAGES"
am: 87b69b97f3

Change-Id: I59df6966eba2aa4a12bfb4081cd6b6a75c313210
2017-06-14 11:12:43 +00:00
Paul Duffin 87b69b97f3 Merge "Added android.test.mock to PRODUCT_PACKAGES" 2017-06-14 11:06:22 +00:00
Android Build Merger (Role) a50f74870d Merge "Merge "Add more libs into generic AOSP system image" into oc-dev am: 57fb2214ab am: 4a421a28d0" into oc-dr1-dev-plus-aosp 2017-06-14 09:12:26 +00:00
SzuWei Lin c5971c7bff Merge "Add more libs into generic AOSP system image" into oc-dev am: 57fb2214ab
am: 47400c5e34

Change-Id: Iffefb631653a13b7c0d334aadffe30010114b10d
2017-06-14 09:12:04 +00:00
SzuWei Lin 13791b5362 Merge "Add more libs into generic AOSP system image" into oc-dev am: 57fb2214ab
am: 4a421a28d0

Change-Id: I73c4b4efd39f14dfcb067b7aa44481a867d0d037
2017-06-14 09:12:04 +00:00
SzuWei Lin 4a421a28d0 Merge "Add more libs into generic AOSP system image" into oc-dev
am: 57fb2214ab

Change-Id: I011b16eb3c7ee21a52a04586d8249254e8d53dc8
2017-06-14 09:10:04 +00:00
SzuWei Lin 47400c5e34 Merge "Add more libs into generic AOSP system image" into oc-dev
am: 57fb2214ab

Change-Id: If56dc8c2a6417b527c243af0151b428677f16f55
2017-06-14 09:10:04 +00:00
TreeHugger Robot 57fb2214ab Merge "Add more libs into generic AOSP system image" into oc-dev 2017-06-14 09:06:45 +00:00
Android Build Merger (Role) d2173f63c3 Merge "Merge "Fix audio policy configuration for generic targets" into oc-dev am: 34d8c95fd7 am: 71891cdb3e" into oc-dr1-dev-plus-aosp 2017-06-14 08:26:01 +00:00
Isaac Chen 32e152136e Merge "Fix audio policy configuration for generic targets" into oc-dev am: 34d8c95fd7
am: 71891cdb3e

Change-Id: I50fe0d246441db9a6fbece919b5cc5a47470fc80
2017-06-14 08:25:06 +00:00
Isaac Chen 47a95bb673 Merge "Fix audio policy configuration for generic targets" into oc-dev am: 34d8c95fd7
am: ea97912057

Change-Id: I0ebf242f841c9c778e943b1cc2d31598e906476a
2017-06-14 08:25:05 +00:00
Isaac Chen 71891cdb3e Merge "Fix audio policy configuration for generic targets" into oc-dev
am: 34d8c95fd7

Change-Id: I16ab64f6955031bfced51e8049f96f95033624ef
2017-06-14 08:22:36 +00:00
Isaac Chen ea97912057 Merge "Fix audio policy configuration for generic targets" into oc-dev
am: 34d8c95fd7

Change-Id: I1d5a39cec809f91477e09c8545c6d1173152ea0f
2017-06-14 08:22:36 +00:00
TreeHugger Robot 34d8c95fd7 Merge "Fix audio policy configuration for generic targets" into oc-dev 2017-06-14 08:17:10 +00:00
Yoshisato Yanagisawa 4f3e5685fc Set JAVAC_WRAPPER if USE_GOMA is set.
Now, people can also use goma for building javac.  Let me make it by
default.

Test: USE_GOMA=true m -j4
Bug: 62334576
Change-Id: I941ce42dc0f9cbd0dcc00e6fd19368c3af11695f
2017-06-14 07:57:54 +00:00
SzuWei Lin 56d68a5192 Add more libs into generic AOSP system image
Includes:
- more HIDL interfaces
- explicitly specify all LL-NDK and SP-NDK (currently only
  libandroid_net is missing)
- add liblzma and libyuv

Bug: 38339299
Test: build aosp_arm64_ab and pass
Change-Id: Ic67d47990cf6b4ab51e1b74f0fed85e60ce3a817
2017-06-14 14:57:15 +08:00
Tao Bao 2ecc50cba4 Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip." am: 9baf675285 am: 7d5f8ec704
am: 5edb6ee6fd

Change-Id: Id342b801dcd112c41235bbf36d18b9ea43ef4d57
2017-06-14 06:25:45 +00:00
Hung-ying Tyan 85507e4a99 Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev am: d9657ef5be -s ours
am: ed4a4a5ada

Change-Id: I19d9cf8a3039cb5099d84e0ee16108a94e39fea1
2017-06-14 06:24:49 +00:00
Bowgo Tsai b3fdefe4f8 Merge "Align size of vbmeta image to 4k boundary" am: 6b126fb7bc am: e7151a57aa
am: e408b4ceb2

Change-Id: I369e41910ebb55722d4bcb65a5b01445be698482
2017-06-14 06:24:16 +00:00
TreeHugger Robot d30cf791f6 Merge "resolve merge conflicts of a24fcf6abc to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp 2017-06-14 06:22:14 +00:00
Tao Bao 5edb6ee6fd Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip." am: 9baf675285
am: 7d5f8ec704

Change-Id: I23d08c4a7b3311afafa857e4efb5a982f8cf0f25
2017-06-14 05:49:58 +00:00
Tao Bao 7d5f8ec704 Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip."
am: 9baf675285

Change-Id: Ic7a9f8735ded10d36d2a97d7b3118bc0ae6f6456
2017-06-14 05:44:56 +00:00
Treehugger Robot 9baf675285 Merge "Allow sign_target_files_apks.py to create zip64 signed TF.zip." 2017-06-14 05:36:51 +00:00
Bowgo Tsai dd6403d8ff Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev
am: 7f0e79b146

Change-Id: I6c80f285a50facbe1fc44f9a264775206cefcbc1
2017-06-14 04:20:25 +00:00
TreeHugger Robot 7f0e79b146 Merge "Align size of vbmeta image to 4k boundary" into oc-dr1-dev 2017-06-14 04:13:42 +00:00
SzuWei Lin 35998bb8e5 resolve merge conflicts of a24fcf6abc to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I52993c61a80bc7aee3d49ce37b88413e8f40f832
2017-06-14 11:56:25 +08:00
Hung-ying Tyan 59996eeef3 Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev am: d9657ef5be -s ours
am: 35405d22e5

Change-Id: Ide3bc9a28b9edb5d09f4d8a09dc7bee1c37ce581
2017-06-14 02:32:42 +00:00
Hung-ying Tyan ed4a4a5ada Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
am: d9657ef5be  -s ours

Change-Id: Id76f0a2076cca32a6090342a16dddfed070e82de
2017-06-14 02:29:36 +00:00
Hung-ying Tyan 35405d22e5 Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev
am: d9657ef5be  -s ours

Change-Id: I91597e28529560d19525a4302fbf69206ebde9c4
2017-06-14 02:29:36 +00:00
Bowgo Tsai e408b4ceb2 Merge "Align size of vbmeta image to 4k boundary" am: 6b126fb7bc
am: e7151a57aa

Change-Id: I0a4dbbe18574e1c2037b185c7e3794033da2c974
2017-06-14 02:14:41 +00:00
Bowgo Tsai 53cf999923 Align size of vbmeta image to 4k boundary
Adding option "--padding_size 4096" when making vbmeta.img.

Bug: 38454093
Test: build vbmeta.img and check it's being padded.
Change-Id: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
Merged-In: Id3ba6bf9998755bae75ec8b272ceccf59f4b8666
(cherry picked from commit 7cd30041e9)
2017-06-14 10:14:24 +08:00
Hung-ying Tyan d9657ef5be Merge "Revert "Revert "Move /default.prop to /system/etc/prop.default""" into oc-dev 2017-06-14 02:13:51 +00:00
Bowgo Tsai e7151a57aa Merge "Align size of vbmeta image to 4k boundary"
am: 6b126fb7bc

Change-Id: Ibf96152b0b1650e33e5d300c05001e84a8253330
2017-06-14 02:10:41 +00:00
Treehugger Robot 6b126fb7bc Merge "Align size of vbmeta image to 4k boundary" 2017-06-14 02:01:45 +00:00
SzuWei Lin a24fcf6abc Merge "Normalize building generic system image with treble-common.mk" into oc-dev-plus-aosp 2017-06-14 01:58:27 +00:00
SzuWei Lin c60ab6e80e Merge "Normalize building generic system image with treble-common.mk" into oc-dr1-dev
am: 34b018804d  -s ours

Change-Id: I605a82f27a4185326da79c9808485f9e94579221
2017-06-14 01:50:15 +00:00