StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,408 Commits 1 Branch 0 Tags
2b6c204c73b97147ec00484904ee6f4bc003cb15
Commit Graph

10777 Commits

Author SHA1 Message Date
Baligh Uddin
442ae0fe5c DO NOT MERGE ANYWHERE - 
Broke the build in mnc-dr-dev

Revert "Add system/extras/verity/build_verity_metadata.py  to otatools"

Bug: 29008004

This reverts commit d26a99c3c6.

Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
 2016-05-27 23:19:57 +00:00
Baligh Uddin
b25a7f38a8 Add system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6 
am: 1e7c1290c6

* commit '1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d
 2016-05-27 22:40:22 +00:00
Baligh Uddin
1e7c1290c6 Add system/extras/verity/build_verity_metadata.py to otatools 
am: d26a99c3c6

* commit 'd26a99c3c6903c02c5435ec5f0123f057527b0a9':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
 2016-05-27 22:37:29 +00:00
Baligh Uddin
d26a99c3c6 Add system/extras/verity/build_verity_metadata.py to otatools 
Bug: 29008004
 2016-05-27 15:19:31 -07:00
Colin Cross
6f8244b62d Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624 
am: 323396993c

* commit '323396993c6651b4b98974df9e9d53118f27a840':
  Fix mm and mmm in Android.bp directories

Change-Id: I95d6bde7a0ea72b47779f1a5b0577ff423524b6f
 2016-05-27 00:29:14 +00:00
Colin Cross
323396993c Merge "Fix mm and mmm in Android.bp directories" 
am: 8ed91b6624

* commit '8ed91b66240d3071a42365737f4cd5c7dbe601e1':
  Fix mm and mmm in Android.bp directories

Change-Id: Id8d80175a2ab27c6ea5a969eb37ad12726e68376
 2016-05-27 00:26:30 +00:00
Treehugger Robot
8ed91b6624 Merge "Fix mm and mmm in Android.bp directories" 2016-05-27 00:23:24 +00:00
Colin Cross
8642525726 Fix mm and mmm in Android.bp directories 
mm and mmm were not parsing out/soong/Android.mk, so they were ignoring
all modules defined in an Android.bp file.  Always include
out/soong/Android.mk when ONE_SHOT_MAKEFILE is set, and convert the mm
and mmm functions to build MODULES-IN-$DIR instead of all_modules so
that only the subset of modules defined in out/soong/Android.mk for the
requested directory are built.

Bug: 28986194
Change-Id: I6e1ff8cacfc668a4154a0d5937450db840bb7a6b
 2016-05-26 15:56:21 -07:00
Dan Willemsen
238f4aafd2 resolve merge conflicts of dfcf2e0 to nyc-dev-plus-aosp 
Change-Id: I5473ac42db3dba12dffb1d40eb9096d738ef977b
 2016-05-26 15:01:20 -07:00
Dan Willemsen
dfcf2e0cbb Merge "Remove unnecessary variables" 
am: 2eb45d9ab2

* commit '2eb45d9ab29b0923aeeea51ae0c58e32fea23941':
  Remove unnecessary variables

Change-Id: I645c34edb93ce262d245867c4efea2d409366a09
 2016-05-26 21:52:54 +00:00
Dan Willemsen
2eb45d9ab2 Merge "Remove unnecessary variables" 2016-05-26 21:49:01 +00:00
Lance Chang
aef86f7f4c Add build number to apps' version name for non-platform build 
If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.

Bug: 28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863
 2016-05-26 12:32:30 -07:00
Dan Willemsen
056609ccfe Remove unnecessary variables 
These are all either recently unused due to the removal of CFLAGS/etc,
or have been exported by Soong and are no longer necessary.

Change-Id: I5930d43fda21acc8202b3d8ea010fbefb6ae4cf1
 2016-05-25 21:23:20 -07:00
Adam Powell
4ea89b7e6c Merge "N is API 24" into nyc-dev 
am: f211cae2ed

* commit 'f211cae2ede701b58228ff0090bb894f17c0557f':
  N is API 24

Change-Id: Id4970239ff53cf27c7d3aa547da383d3f80d2ec9
 2016-05-26 01:19:57 +00:00
Colin Cross
44cf069b30 Merge "Remove USE_SOONG=false option" am: 5413fb4b3e 
am: a36de73331

* commit 'a36de73331b92e5e75ba92e7a4707e5850e3486d':
  Remove USE_SOONG=false option

Change-Id: Iba393dadd32a55e910cf0ab980a1e82887f60bb9
 2016-05-26 01:04:52 +00:00
TreeHugger Robot
f211cae2ed Merge "N is API 24" into nyc-dev 2016-05-26 01:03:09 +00:00
Colin Cross
a36de73331 Merge "Remove USE_SOONG=false option" 
am: 5413fb4b3e

* commit '5413fb4b3e2310be8568f5024fdc4d0900bf9f9e':
  Remove USE_SOONG=false option

Change-Id: I83c44d57917a10838dd9626d382b4e992c58f822
 2016-05-26 00:57:54 +00:00
Adam Powell
891d86d492 N is API 24 
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
 2016-05-25 16:48:56 -07:00
Zach Jang
2be52191be Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401 
am: e29b42ffef

* commit 'e29b42ffef47991c090ca8008a9addb9e479fc2a':
  Updating security string to 2016-07-05

Change-Id: Ia97a6f74950118f48e0dd48fd3fe00684ce405af
 2016-05-25 21:11:13 +00:00
Zach Jang
e29b42ffef Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd 
am: cf227d4401

* commit 'cf227d440176f5c10b252ff75fdc6aabf7d4829d':
  Updating security string to 2016-07-05

Change-Id: Iffcc0c0b77df8d1bbb69bfd69f9ef0818e469c68
 2016-05-25 21:02:20 +00:00
Zach Jang
cf227d4401 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 
am: 4af9b20fbd

* commit '4af9b20fbd847ffab365a4677de0e9752737c4f3':
  Updating security string to 2016-07-05

Change-Id: I9e5d40dc3710efa07a7fa365d99f3bf6d6dc2109
 2016-05-25 20:57:41 +00:00
Zach Jang
4af9b20fbd Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 
am: db34ed5f83

* commit 'db34ed5f83efc646f37eae8ee61233ee2c2e4979':
  Updating security string to 2016-07-05

Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0
 2016-05-25 20:52:57 +00:00
Zach Jang
db34ed5f83 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 
am: bf5d08ecf4

* commit 'bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
  Updating security string to 2016-07-05

Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7
 2016-05-25 20:44:22 +00:00
Zach Jang
bf5d08ecf4 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad 
am: 7cc20fe0a0

* commit '7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
  Updating security string to 2016-07-05

Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3
 2016-05-25 20:39:28 +00:00
Zach Jang
7cc20fe0a0 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f 
am: e7660e56ad

* commit 'e7660e56ad330c8469857014c448130143c86856':
  Updating security string to 2016-07-05

Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe
 2016-05-25 20:34:46 +00:00
Zach Jang
e7660e56ad Merge "Updating security string to 2016-07-05" into lmp-mr1-dev 
am: ab6c08949f

* commit 'ab6c08949f2a96867b1eda536eeb74982a49d5d3':
  Updating security string to 2016-07-05

Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8
 2016-05-25 20:30:14 +00:00
Zach Jang
60270ec785 DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 
am: 555c5af89a

* commit '555c5af89a4b25f61ff827431b0081be7b70d5fe':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
 2016-05-25 20:07:30 +00:00
Zach Jang
555c5af89a DO NOT MERGE Updating security string to 2016-07-05 
am: f885e95375

* commit 'f885e95375a48aeefd7d2451a5c61a48100bac77':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
 2016-05-25 20:03:05 +00:00
Colin Cross
a61d672529 Remove USE_SOONG=false option 
Soong is always required to build now.

Change-Id: I4e310e98e912b370ebf980bf609f04212a7e9a50
 2016-05-25 12:55:43 -07:00
Zach Jang
f885e95375 DO NOT MERGE Updating security string to 2016-07-05 
b/28912173

Change-Id: I81301d51fd62932005a24178c57a0731566910a6
 2016-05-25 19:43:28 +00:00
Zach Jang
ea3b024d7d Updating security string to 2016-07-05 
b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
 2016-05-25 12:38:46 -07:00
Dan Willemsen
062e30b422 Error on external includes 
To make the build hermetic, all include files should be located within
the source tree (or generated as output).

There was an Android.mk that was adding /usr/include to its include
path.

Change-Id: I4c40b908314239c8239c7835d592e409248a3150
 2016-05-24 16:40:11 -07:00
Dan Willemsen
7fe992c0cc Add NATIVE_TESTS class, move host native tests 
Host native tests have been getting installed into
out/host/linux-x86/bin/..., but this pollutes the bin directory with a
lot of poorly named tests. Also, to support 32-bit and 64-bit tests, we
need to have different names with different suffixes. This causes
problems when tests expect to be named something specific (like gtest).
It's also convenient to store test data next to the test itself.

So with this change, native tests will be installed in
out/host/linux-x86/nativetest[64]/$(LOCAL_MODULE)/$(LOCAL_MODULE_STEM)
just like target tests get installed into /data/nativetest[64].

Implement this using a new NATIVE_TESTS class, which is like
EXECUTABLES, but sets up the install path differently, and configures
the rpath to load shared libraries with the proper relative path.
LOCAL_MODULE_RELATIVE_PATH can be used to control the directory name, it
will default to $(LOCAL_MODULE). This way multiple related tests can be
grouped together.

Target native tests also use NATIVE_TESTS now, but nothing should change
other than LOCAL_MODULE_RELATIVE_PATH can be used.

Change-Id: I535e42b1a6b21c5b8d6a580aa2f944d2be35e27d
 2016-05-24 12:43:16 -07:00
Zach Jang
c531f9eea7 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c 
am: f8a869d5d8

* commit 'f8a869d5d8a3989e240cde063322f9441ad35d16':
  Updating security string to 2016-07-01

Change-Id: I41563d0fad2be27309de6890d472ebe1e279533a
 2016-05-24 01:22:07 +00:00
Zach Jang
f8a869d5d8 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c 
am: 3ffee87b5c

* commit '3ffee87b5cd468aa5bf14a3e326aa080948db4f3':
  Updating security string to 2016-07-01

Change-Id: Id3468f4dbeb626ad3289f5acef32a72e3e18201b
 2016-05-24 01:19:54 +00:00
Zach Jang
3ffee87b5c Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 
am: 2d75d4447c

* commit '2d75d4447ca47666b20fe91e595a3274c8a975cf':
  Updating security string to 2016-07-01

Change-Id: I59ad6e51072d854b052873a0ec32d8de2cdf5a1d
 2016-05-24 01:17:01 +00:00
Zach Jang
2d75d4447c Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 
am: 608f329e07

* commit '608f329e0718a9ef3ed89b3f9d4768b003bc88de':
  Updating security string to 2016-07-01

Change-Id: I93c86db7e020f586784f8a8b106806dbb7874d76
 2016-05-24 01:14:26 +00:00
Zach Jang
608f329e07 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d 
am: 3e082f1e64

* commit '3e082f1e649821f00ec751824e901f64a2756269':
  Updating security string to 2016-07-01

Change-Id: I5c04b6e42927d45c9bf0e2f842cd9eac8f62dfa5
 2016-05-24 01:11:45 +00:00
Zach Jang
3e082f1e64 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 
am: 0b4608ca4d

* commit '0b4608ca4d8b10af335f839350a4224a198e8dee':
  Updating security string to 2016-07-01

Change-Id: I08d096476c645d304ab5038cd5ca586073424157
 2016-05-24 01:09:15 +00:00
Zach Jang
2ee84bf0a5 DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 
am: 0bdac8fba3

* commit '0bdac8fba335f4e1620871bf5082dbebc55a497d':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f
 2016-05-24 01:06:37 +00:00
Zach Jang
0b4608ca4d Updating security string to 2016-07-01 am: 45ff24a04b 
am: 1dd3095e78

* commit '1dd3095e780dc83aa1b4056f298a4678bead075a':
  Updating security string to 2016-07-01

Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08
 2016-05-24 01:06:37 +00:00
Zach Jang
1dd3095e78 Updating security string to 2016-07-01 
am: 45ff24a04b

* commit '45ff24a04bd5d3af706ae3aa6266106560070a3d':
  Updating security string to 2016-07-01

Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4
 2016-05-24 01:02:06 +00:00
Zach Jang
0bdac8fba3 DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only 
am: 89f6f7aa01

* commit '89f6f7aa01591e8524ef0c4b5efa7433d082a9b9':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62
 2016-05-24 01:02:05 +00:00
Colin Cross
ca5083195e Merge "Error on USE_CLANG_PLATFORM_BUILD=" am: 7b31dd1094 
am: 893f32053f

* commit '893f32053f78def4582ceb54b19ddb1253b73495':
  Error on USE_CLANG_PLATFORM_BUILD=

Change-Id: Ibc43aee7aecb6526436be08e78622a2e4690e71c
 2016-05-23 22:21:46 +00:00
Colin Cross
893f32053f Merge "Error on USE_CLANG_PLATFORM_BUILD=" 
am: 7b31dd1094

* commit '7b31dd10948abccc9c8b2f949edbe84de15702d5':
  Error on USE_CLANG_PLATFORM_BUILD=

Change-Id: Iea742a5cd8230587656460cc5ad6b979ba2189a5
 2016-05-23 22:17:34 +00:00
Colin Cross
7b31dd1094 Merge "Error on USE_CLANG_PLATFORM_BUILD=" 2016-05-23 22:05:27 +00:00
Dan Willemsen
5f5c4bccd9 Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: c11ae6c569 
am: 8b0af507d9

* commit '8b0af507d97b4e93bbe8d6afbc33d7840478729e':
  Add LOCAL_CTS_GTEST_LIST_EXECUTABLE

Change-Id: Ibb4ff3b5b972ed3f7a35c122b6da1ee18de1212f
 2016-05-23 21:32:01 +00:00
Dan Willemsen
8b0af507d9 Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE" 
am: c11ae6c569

* commit 'c11ae6c569c26607a165e6fe491008bdd272d981':
  Add LOCAL_CTS_GTEST_LIST_EXECUTABLE

Change-Id: Id305d60c8db698fa90b09fb547f606b62bb37ad9
 2016-05-23 21:28:36 +00:00
Treehugger Robot
c11ae6c569 Merge "Add LOCAL_CTS_GTEST_LIST_EXECUTABLE" 2016-05-23 21:18:58 +00:00
Zach Jang
45ff24a04b Updating security string to 2016-07-01 
b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
 2016-05-23 13:26:32 -07:00