Commit Graph

44134 Commits

Author SHA1 Message Date
TreeHugger Robot 18fbe81b9f Merge "Mark version_defaults as readonly" into pi-dev-plus-aosp 2018-04-13 21:39:43 +00:00
Wale Ogunwale 4079cd2259 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev
am: 03b6fa6a64

Change-Id: Id729269a0e333a3b6ed5ed32ca4735f8ebbbfaf3
2018-04-13 14:07:13 -07:00
Wale Ogunwale 040ba07736 Merge "Finalizing P SDK" into pi-dev
am: 5de065e3ec

Change-Id: I552ebda180de398512b91addde17d8d48ec60624
2018-04-13 14:06:43 -07:00
Wale Ogunwale 03b6fa6a64 Merge "Freeze VNDK list for finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
Wale Ogunwale 5de065e3ec Merge "Finalizing P SDK" into pi-dev 2018-04-13 20:53:03 +00:00
Ruchi Kandoi 85bc17b549 Merge "Adds SecureElement apk to core.mk" into pi-dev
am: 08afb09c5c

Change-Id: I21d6a5fa950a017881d9ffd68cf6a8f2414f322f
2018-04-13 13:45:08 -07:00
TreeHugger Robot 08afb09c5c Merge "Adds SecureElement apk to core.mk" into pi-dev 2018-04-13 20:30:26 +00:00
Chih-hung Hsieh 4991178be2 Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD" am: a72e1518e7
am: db18e11b86

Change-Id: I7f8fafc80a9be06fad05f801edad4510be2ed3f8
2018-04-13 12:44:10 -07:00
Chih-hung Hsieh db18e11b86 Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD"
am: a72e1518e7

Change-Id: I16b12fa2c788ffdf7c444de6112d110c7e3963e0
2018-04-13 12:36:35 -07:00
Chih-hung Hsieh a72e1518e7 Merge "Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD" 2018-04-13 19:26:04 +00:00
Wale Ogunwale 07a54b7fba Finalizing P SDK
Bug: 77588754
Test: builds
Merged-In: Iebb43a246016774150a3053f10bdedb0278b3e5d
Change-Id: Ied2e381795643aaf8c48e6c89d8ee66b8b5b15ed
2018-04-13 14:59:03 +00:00
Justin Yun 7a239c4ce3 [automerger skipped] Check vndk list on build
am: 32e3453212  -s ours

Change-Id: I8d073d90f2662b4a85cb822d30a6ad5a34049b12
2018-04-13 01:19:52 -07:00
Justin Yun 32e3453212 Check vndk list on build
Check current vndk list on build time with current.txt.
If the vndk list is changed, the current.txt must be updated
manually. Otherwise the build will report an error.

The list is not allowed to be updated for the release versions.

Bug: 77816590
Bug: 67002788
Test: run 'm check-vndk-list' and check if build is successful.
Test: 1. change vndk property of a module and run 'm check-vndk-list'
         and check if build is failed.
      2. run 'update-vndk-list.sh'.
      3. run 'm check-vndk-list' again and check if build is
         successful.

Change-Id: I4caeb9eafa898f175d40f96125b9997edaeadbeb
Merged-In: I4caeb9eafa898f175d40f96125b9997edaeadbeb
(cherry picked from commit 27caa055b9e53f65b9d0aec126e05dab32145717)
2018-04-13 08:12:35 +00:00
Justin Yun 056289405a Merge "Check vndk list on build" am: 93dcc11c17
am: 471c65c820

Change-Id: I25c4df8f50a403e60613516573cd2909ea1592e5
2018-04-13 00:35:45 -07:00
Justin Yun 471c65c820 Merge "Check vndk list on build"
am: 93dcc11c17

Change-Id: Ia48a3d2fcee06fbba0ab9e68cb91121c189f1e14
2018-04-13 00:28:12 -07:00
Treehugger Robot 93dcc11c17 Merge "Check vndk list on build" 2018-04-13 07:14:14 +00:00
Justin Yun 0dfc7b35f8 [automerger skipped] Merge "Update current.txt to latest vndk list" am: c9b4f1270a
am: ffe76f5777  -s ours

Change-Id: I429a04527189e9a495b440c377fb6dc216761b93
2018-04-12 22:39:29 -07:00
Justin Yun ffe76f5777 Merge "Update current.txt to latest vndk list"
am: c9b4f1270a

Change-Id: Ia1505f9d75db662cd823255b909654afe1c9658d
2018-04-12 22:32:52 -07:00
Justin Yun 36e465a4b2 Check vndk list on build
Check current vndk list on build time with current.txt.
If the vndk list is changed, the current.txt must be updated
manually. Otherwise the build will report an error.

The list is not allowed to be updated for the release versions.

Bug: 77816590
Bug: 67002788
Test: run 'm check-vndk-list' and check if build is successful.
Test: 1. change vndk property of a module and run 'm check-vndk-list'
         and check if build is failed.
      2. run 'update-vndk-list.sh'.
      3. run 'm check-vndk-list' again and check if build is
         successful.

Change-Id: I4caeb9eafa898f175d40f96125b9997edaeadbeb
2018-04-13 05:20:15 +00:00
Treehugger Robot c9b4f1270a Merge "Update current.txt to latest vndk list" 2018-04-13 05:17:22 +00:00
Justin Yun d27468508a Update current.txt to latest vndk list
Add libneuralnetworks.so to LL-NDK list.

Bug: 77161122
Test: m check-vndk-list
Change-Id: Ic2820103bbacdef4a299670cdb6497ab5c7af3c0
Merged-In: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 05:10:42 +00:00
Justin Yun 2f695242f4 [automerger skipped] Update current.txt for current vndk list
am: 681cdaf454  -s ours

Change-Id: I7080d082d6fff5a956254c4731df466bbe3ee6ca
2018-04-12 20:34:00 -07:00
Justin Yun a5af5abcd4 [automerger skipped] Exclude libclang_rt from checking vndk list
am: b9346013b6  -s ours

Change-Id: I61076ab75a18f6758f270a874066d4aefd44f4b2
2018-04-12 19:58:50 -07:00
Justin Yun 53d312828f Freeze VNDK list for finalizing P SDK
Bug: 77816590
Test: build and boot
Change-Id: If6dd1530c4f15a783543b2102a5ddde1b9218735
2018-04-13 02:52:34 +00:00
Justin Yun 681cdaf454 Update current.txt for current vndk list
current.txt must be updated to have current vndk list in each branch.

Bug: 77816590
Test: m check-vndk-list
Change-Id: I16dcf73dde0dedca1c6639d6ea4158992febcb67
Merged-In: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 02:51:10 +00:00
Dan Willemsen fcf0b6c861 Merge "Add USER to the docker environment" am: e3bb8e10dc
am: 5aac651374

Change-Id: If83def12536be0452a5c80eec6065cb2a811b45b
2018-04-12 18:36:25 -07:00
Dan Willemsen 5aac651374 Merge "Add USER to the docker environment"
am: e3bb8e10dc

Change-Id: I0008447de4d8c251371cce4c234eb052ac9a5666
2018-04-12 18:30:27 -07:00
Justin Yun b9346013b6 Exclude libclang_rt from checking vndk list
libclang_rt libs are prebuilt libs that have different names by the
architecture they are built.

Bug: 77931086
Bug: 77816590
Bug: 67002788
Test: 'm check-vndk-list' for various architectures.
Change-Id: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
Merged-In: Iacb3979b6e5df7e9ba8073470aab23c603b4db55
(cherry picked from commit 016020923a)
2018-04-13 01:22:02 +00:00
Logan Chien 818617f8ff [automerger skipped] Merge "Move logwrapper to shell_and_utilities." into pi-dev
am: c188bb8828  -s ours

Change-Id: Ic418340997f1272fd8b0953062b23f82b379ca83
2018-04-12 18:19:13 -07:00
Treehugger Robot e3bb8e10dc Merge "Add USER to the docker environment" 2018-04-13 01:16:30 +00:00
Logan Chien c188bb8828 Merge "Move logwrapper to shell_and_utilities." into pi-dev 2018-04-13 00:56:38 +00:00
Jiyong Park 413c659932 [automerger skipped] Allow native:vendor to vendor apks
am: 0fa0052583  -s ours

Change-Id: I758faddaa1fe4391efe239b47208e1600b237dd4
2018-04-12 17:18:49 -07:00
Justin Yun 241dea0c15 Update current.txt for current vndk list
current.txt must be updated to have current vndk list in each branch.

Bug: 77816590
Test: m check-vndk-list
Change-Id: Ia5d27d044e2bf67872238154a32d0b96f6933148
2018-04-13 08:54:26 +09:00
Dan Willemsen c7f16e4fd4 Add USER to the docker environment
Apparently Jack needs this, and my previous testing didn't show it.

Test: build & run image; echo $USER
Change-Id: I66766b230f2f3e0762a49efc9bf2c6212b2b2c4d
2018-04-12 16:41:17 -07:00
Dan Willemsen 693c7fb31b Mark version_defaults as readonly
These shouldn't be changed by anyone after this point, and this will
prevent random Android.mk from re-including this file.

Test: m nothing
Test: failed on hikey w/o https://android-review.googlesource.com/662764
Change-Id: I7ba4db3594af5b18b98fafee81b64531a40df396
2018-04-12 23:37:46 +00:00
Jiyong Park 0fa0052583 Allow native:vendor to vendor apks
Vendor apks should be able to reference native vendor libraries.
Vendor apks have worked around this by building without
LOCAL_SDK_VERSION, which then allowed to use all libs. However,
since vendor apks now needs to be built with SystemSDK, that
workaround can no longer be used.

Bug: 76398918
Test: BOARD_SYSTEMSDK_VERSION=P m -j
Merged-In: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
Change-Id: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
(cherry picked from commit 49a5b9785f)
2018-04-13 07:50:31 +09:00
Mathieu Chartier 1401d9cf81 Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set" am: 65ba0bf59c
am: 4157c834db

Change-Id: I19f13a153e403b96c82d9f72a82042a2c5772288
2018-04-12 15:33:48 -07:00
Mathieu Chartier 4157c834db Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set"
am: 65ba0bf59c

Change-Id: I56882452ae7e794d2cbee8f3e4c04fc1d11e1fe1
2018-04-12 15:26:32 -07:00
Mathieu Chartier 65ba0bf59c Merge "Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set" 2018-04-12 22:10:57 +00:00
Ruchi Kandoi d7568287df Adds SecureElement apk to core.mk
Test: Build and install images
Bug: 64994044
Change-Id: I34ccf346bc9befb78fd7909a6ab6b2d1059b9ed3
2018-04-12 14:28:50 -07:00
Chih-Hung Hsieh 32427d6903 Add USE_CLANG_LLD and LOCAL_USE_CLANG_LLD
* Current default is not using lld.
* When USE_CLANG_LLD or LOCAL_USE_CLANG_LLD is true or 1,
  * Use *GLOBAL_LLDFLAGS instead of *GLOBAL_LDFLAGS.
    GLOBAL_LLDFLAGS should call lld and with correct lld flags.
  * set my_pack_module_relocations to false.

Bug: 73768157
Test: make checkbuild
Change-Id: I3e63cf8ae0865d01d2bc1f36e9304f4a5d092cb8
2018-04-12 11:00:06 -07:00
Jiyong Park a8750f0dfb Merge "Allow native:vendor to vendor apks" am: f2fc1418d3
am: 16a4fb198b

Change-Id: Ie5bbf02c8e8452381b38323d96d887126d268b86
2018-04-12 10:40:29 -07:00
Jiyong Park 16a4fb198b Merge "Allow native:vendor to vendor apks"
am: f2fc1418d3

Change-Id: I36e8d2d7cbb16f183cf0cfeb0fc33f8360984af4
2018-04-12 10:35:21 -07:00
Treehugger Robot f2fc1418d3 Merge "Allow native:vendor to vendor apks" 2018-04-12 17:21:59 +00:00
Mathieu Chartier aaca16f0f7 Only default LOCAL_DEX_PREOPT_APP_IMAGE if not set
Allows modules to specify LOCAL_DEX_PREOPT_APP_IMAGE := false if they
have a profile.

Test: make
Change-Id: Ied7a8099b199904638dabdb09faf879d3216e73d
2018-04-12 17:02:30 +00:00
Elliott Hughes 53f0d2910f Move logwrapper to shell_and_utilities.
Bug: 77284669
Test: builds
Change-Id: I22549e321d88007480e7d9d961e41db2b9a26a41
Merged-In: I22549e321d88007480e7d9d961e41db2b9a26a41
(cherry picked from commit d5ad9346fb)
2018-04-12 12:13:02 +00:00
Ivan Podogov 0cf73852fc Merge "Add vendor properties blacklist" am: 2e2290cf1a
am: 869d4e5869

Change-Id: I43f875870aac9665fc3684a468f57bc669d05c3e
2018-04-12 03:18:23 -07:00
Ivan Podogov 869d4e5869 Merge "Add vendor properties blacklist"
am: 2e2290cf1a

Change-Id: I272d57b1b7729304a382c0d190e10da7180ca0ac
2018-04-12 03:14:17 -07:00
Treehugger Robot 2e2290cf1a Merge "Add vendor properties blacklist" 2018-04-12 10:08:10 +00:00
Jiyong Park 49a5b9785f Allow native:vendor to vendor apks
Vendor apks should be able to reference native vendor libraries.
Vendor apks have worked around this by building without
LOCAL_SDK_VERSION, which then allowed to use all libs. However,
since vendor apks now needs to be built with SystemSDK, that
workaround can no longer be used.

Bug: 76398918
Test: BOARD_SYSTEMSDK_VERSION=P m -j
Change-Id: Idb13d5db71f4dfd542658483b6a24e7ece18ce26
2018-04-12 17:14:48 +09:00