Commit Graph

43497 Commits

Author SHA1 Message Date
Dan Willemsen f48db2429d Merge "Better error for missing LOCAL_SRC_FILES in prebuilts" am: 3279e0c267 am: 4e7e4647bd
am: 62f6a2c11f

Change-Id: I364a686e163589829c45463f937662084e4436ad
2018-02-27 22:37:29 +00:00
Tao Bao 9a90d8cae6 Merge "releasetools: Remove the unneeded 'prefix' parameters." am: 6e2a8ae094 am: 945e9c3e44
am: 5d74ac8574

Change-Id: I84554693ebd6be87eb0989d9b2d1df5f049c62f7
2018-02-27 22:36:18 +00:00
Dan Willemsen 62f6a2c11f Merge "Better error for missing LOCAL_SRC_FILES in prebuilts" am: 3279e0c267
am: 4e7e4647bd

Change-Id: Ic4614572b604c7a6a80bfa262140dea2681e7af1
2018-02-27 22:32:05 +00:00
Tao Bao 5d74ac8574 Merge "releasetools: Remove the unneeded 'prefix' parameters." am: 6e2a8ae094
am: 945e9c3e44

Change-Id: Iee385b3b5d3a8f3848ccbfdd3773b7cf287f40cf
2018-02-27 22:31:24 +00:00
Dan Willemsen 4e7e4647bd Merge "Better error for missing LOCAL_SRC_FILES in prebuilts"
am: 3279e0c267

Change-Id: I9ff396e4a4f03c59d5b5c9f127d848bdfc7d29f6
2018-02-27 22:26:51 +00:00
Tao Bao 945e9c3e44 Merge "releasetools: Remove the unneeded 'prefix' parameters."
am: 6e2a8ae094

Change-Id: I6d83836b37de41674817ce3eab5f92fddeb1de35
2018-02-27 22:26:16 +00:00
Dan Willemsen 3279e0c267 Merge "Better error for missing LOCAL_SRC_FILES in prebuilts" 2018-02-27 22:19:49 +00:00
Tao Bao 6e2a8ae094 Merge "releasetools: Remove the unneeded 'prefix' parameters." 2018-02-27 22:13:06 +00:00
Bruno Martins 24043e033e Merge "core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES" am: 7889d64db2 am: 20c90b07b5
am: 4997e05954

Change-Id: I84730f0944d1121ba4bef1656b60f62601e503f8
2018-02-27 22:10:30 +00:00
Bruno Martins 4997e05954 Merge "core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES" am: 7889d64db2
am: 20c90b07b5

Change-Id: If1cf26324774a6f38399db95791f2f1411974ea4
2018-02-27 22:05:58 +00:00
Bruno Martins 20c90b07b5 Merge "core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES"
am: 7889d64db2

Change-Id: I50a6783914549e53f57cf5699df073f2f650b2ed
2018-02-27 22:00:47 +00:00
Treehugger Robot 7889d64db2 Merge "core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES" 2018-02-27 21:47:23 +00:00
Dan Willemsen 699c68e1d0 Merge "Remove some uses of export/unexport" am: 76d45d8ddf am: 39f4686998
am: b684761fd7

Change-Id: I8373a0e1344235be3b5994f829927e8362b5d4a0
2018-02-27 21:39:53 +00:00
Dan Willemsen b684761fd7 Merge "Remove some uses of export/unexport" am: 76d45d8ddf
am: 39f4686998

Change-Id: Ib1e8692c19d5cd601a6d4554e7ab87b1eff59c2e
2018-02-27 21:34:40 +00:00
Dan Willemsen 39f4686998 Merge "Remove some uses of export/unexport"
am: 76d45d8ddf

Change-Id: Ibd1f7146861a278bc2c71dae2e3f654e36b3b739
2018-02-27 21:30:30 +00:00
Dan Willemsen 76d45d8ddf Merge "Remove some uses of export/unexport" 2018-02-27 21:22:20 +00:00
Tao Bao 886d883d61 releasetools: Remove the unneeded 'prefix' parameters.
... from the following functions in add_img_to_target_files.py.

  AddSystem
  AddSystemOther
  AddVendor
  AddProduct
  AddDtbo
  AddUserdata
  AddVBMeta
  AddPartitionTable
  AddCache

The last user of the parameter in img_from_target_files.py has been
removed in commit 2bb109709a (in O).

Test: pylint --rcfile=pylintrc add_img_to_target_files.py
Test: Check all the callers to the above functions.
Test: m dist
Change-Id: I551d1683def8f8535062fc90f68dafa0f4252822
2018-02-27 11:47:11 -08:00
Nick Kralevich ad80d5461b Merge "remove nnk from OWNERS" am: d6fa5bbc51 am: 439ecf8088
am: ee79f54630

Change-Id: I524d927a255b1b4b13a033a95d49466fece9d0eb
2018-02-27 19:34:32 +00:00
Nick Kralevich ee79f54630 Merge "remove nnk from OWNERS" am: d6fa5bbc51
am: 439ecf8088

Change-Id: Ic428009c4d93f44354f16edb52b4bbb117a1ea6b
2018-02-27 19:27:30 +00:00
Nick Kralevich 439ecf8088 Merge "remove nnk from OWNERS"
am: d6fa5bbc51

Change-Id: I65350a259e9f40e566046e97fd127abf7d50d0fd
2018-02-27 19:16:22 +00:00
Treehugger Robot d6fa5bbc51 Merge "remove nnk from OWNERS" 2018-02-27 19:04:47 +00:00
Nick Kralevich 0aa64275e8 remove nnk from OWNERS
See https://android-review.googlesource.com/c/platform/system/sepolicy/+/626014

Also remove klyubin who is no longer at Google.

Test: none
Change-Id: I98534c0cc676e41129b73331ad0e71e7fc1aa1ab
2018-02-27 09:15:10 -08:00
Luis Hector Chavez 0fae5d0806 Merge "Make mksquashfs generate a fs_config-friendly root entry" am: 3d4fb4e335 am: 6128d7f30d
am: 21025515e4

Change-Id: I710cbaa8379c118e0c6a519f5d737a6395de2646
2018-02-27 16:41:46 +00:00
Luis Hector Chavez 21025515e4 Merge "Make mksquashfs generate a fs_config-friendly root entry" am: 3d4fb4e335
am: 6128d7f30d

Change-Id: I43a62ea7c4d6acb5adadfc488b94e05024499320
2018-02-27 16:36:39 +00:00
Luis Hector Chavez 6128d7f30d Merge "Make mksquashfs generate a fs_config-friendly root entry"
am: 3d4fb4e335

Change-Id: I1cfd3479b52a950438ff1b2a68d24d0884dea16a
2018-02-27 16:30:33 +00:00
Treehugger Robot 3d4fb4e335 Merge "Make mksquashfs generate a fs_config-friendly root entry" 2018-02-27 16:24:21 +00:00
Dan Willemsen fb394978aa Remove some uses of export/unexport
All of these are already handled by soong_ui.

Test: inspect build/soong/ui/build/config.go
Change-Id: I3aa4dcd40ea92759374f9894d525507ef970a584
2018-02-27 02:14:11 -08:00
Dan Willemsen 8d5dc6be57 Better error for missing LOCAL_SRC_FILES in prebuilts
If there's a prebuilt with LOCAL_MULTILIB := true, but only a single
LOCAL_SRC_FILES entry, we end up with a weird build error where `cp`
is trying to copy the local directory. Exit early with an error in this
case.

Bug: 73904572
Test: build-aosp_marlin.ninja is identical
Change-Id: Ie2821817c237087a96e87fb9602e430e0f86584a
2018-02-26 21:01:45 -08:00
Dan Willemsen f65052640e Merge "Use xmllint built from source" am: 063e6b2939 am: 41d79327cd
am: 993655b8bf

Change-Id: I182feaff6e3db997407affd5520f57b421b8e433
2018-02-27 04:43:13 +00:00
Dan Willemsen 993655b8bf Merge "Use xmllint built from source" am: 063e6b2939
am: 41d79327cd

Change-Id: Iab0948ce48bd63591fefede07669f129d990835c
2018-02-27 04:38:10 +00:00
Dan Willemsen 41d79327cd Merge "Use xmllint built from source"
am: 063e6b2939

Change-Id: I554f0b5c1b7bdcb78d4f724353a2ed32610047a2
2018-02-27 04:32:58 +00:00
Treehugger Robot 063e6b2939 Merge "Use xmllint built from source" 2018-02-27 04:28:18 +00:00
Dan Willemsen 4c36d45a2c Use xmllint built from source
Instead of relying on whatever version of xmllint is on the host system,
build and use the version in external/libxml2.

Test: diff build_aosp-marlin.ninja, expected changes.
Test: m $(xmllint targets in build_aosp-marlin.ninja)
Test: introduce xml error, build fails
Change-Id: I39579f06db3777e3b5c8dda7c7541c25a35887b2
2018-02-27 02:34:08 +00:00
Justin Yun 5bbc56f825 Merge "Create firmware and persist in GSI for arm_ab" am: 19db058484 am: 308fbbdb54
am: ffffefd791

Change-Id: I38828c768cfd363f3a05fea074d9c48ed11c041c
2018-02-27 00:26:42 +00:00
Justin Yun ffffefd791 Merge "Create firmware and persist in GSI for arm_ab" am: 19db058484
am: 308fbbdb54

Change-Id: Id8df567bb351cc02859055c10cf37a9c3f1c82fd
2018-02-27 00:20:00 +00:00
Justin Yun 308fbbdb54 Merge "Create firmware and persist in GSI for arm_ab"
am: 19db058484

Change-Id: I38a60d919880a2b7ca9f1544d02efd0dcd610203
2018-02-27 00:10:57 +00:00
Treehugger Robot 19db058484 Merge "Create firmware and persist in GSI for arm_ab" 2018-02-26 23:56:11 +00:00
Dan Shi 9801d9b7b2 Merge "Default test to AndroidJUnitTest for auto-generated test config." am: ce1fa25d1b am: d91129eea9
am: 6dbd9e3df9

Change-Id: I84ee22fa20b08fb3db27d5e5d0e03f097a11463f
2018-02-26 23:26:06 +00:00
Dan Shi 6dbd9e3df9 Merge "Default test to AndroidJUnitTest for auto-generated test config." am: ce1fa25d1b
am: d91129eea9

Change-Id: Ib0e817e8d403ea130516dbc94201fd4a899c327f
2018-02-26 23:18:57 +00:00
Justin Yun 38e934a38e Create firmware and persist in GSI for arm_ab
Some SoC vendors require firmware and persist directores to mount.
This must be provided in GSI for arm_ab not only for arm64_ab.
Once the directories are moved to /vendor, these policies for root
must be removed.

Bug: 36764215
Bug: 73720182
Test: GSI boot with 32bit devices
Change-Id: Ic5c6bb615c39853d51d233c00d2d9e8ee2c57802
2018-02-26 23:10:47 +00:00
Dan Shi d91129eea9 Merge "Default test to AndroidJUnitTest for auto-generated test config."
am: ce1fa25d1b

Change-Id: Icbc622f78eff0645272a8d10f0ec0a3ac6971ead
2018-02-26 23:10:22 +00:00
Treehugger Robot ce1fa25d1b Merge "Default test to AndroidJUnitTest for auto-generated test config." 2018-02-26 23:00:28 +00:00
Tao Bao 47db251db0 Merge "releasetools: Remove the parsing of META/imagesizes.txt." am: 3aee4dfac1 am: 72f3c44243
am: ed98b94326

Change-Id: Id4f84a66faf7c06b4bbacae799d36db4a498182b
2018-02-26 22:46:52 +00:00
Tao Bao ed98b94326 Merge "releasetools: Remove the parsing of META/imagesizes.txt." am: 3aee4dfac1
am: 72f3c44243

Change-Id: I83af79b6d5a76099259a951585d92755b132af9e
2018-02-26 22:39:14 +00:00
Tao Bao 0835594a6f Merge "releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta()." am: 7998503ebe am: 5fed709d60
am: b8d0b5bd06

Change-Id: Iec88f7bdbf26047479d217d756d4847b1bac64f7
2018-02-26 22:32:18 +00:00
Tao Bao 72f3c44243 Merge "releasetools: Remove the parsing of META/imagesizes.txt."
am: 3aee4dfac1

Change-Id: If3606b3ebe8fe795748022634af7c1de8a621587
2018-02-26 22:32:09 +00:00
Tao Bao b8d0b5bd06 Merge "releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta()." am: 7998503ebe
am: 5fed709d60

Change-Id: I117d452b1a4d63b7665c3593b5b2167fe57be954
2018-02-26 22:24:13 +00:00
Treehugger Robot 3aee4dfac1 Merge "releasetools: Remove the parsing of META/imagesizes.txt." 2018-02-26 22:18:31 +00:00
Tao Bao 5fed709d60 Merge "releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta()."
am: 7998503ebe

Change-Id: I97f5e2da573d8448b8cd89655d1f5e570c0bf59c
2018-02-26 22:16:35 +00:00
Tao Bao 7998503ebe Merge "releasetools: Add unittests for GetCareMap() and AddCareMapTxtForAbOta()." 2018-02-26 22:06:32 +00:00