tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
49869 commits 1 branch 0 tags 119 MiB
Commit graph

49869 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roland Levillain
1f355b181d Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." am: dbfe39faa2 
am: 0e0ffc1053

Change-Id: I91aa17f26b372b301386c880c2ec66821fe6ec6a
 2019-03-14 06:36:55 -07:00
Roland Levillain
0e0ffc1053 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." 
am: dbfe39faa2

Change-Id: I065fc822abc7b9dda99e1fc83ef32f07a47e8b3a
 2019-03-14 06:31:45 -07:00
Roland Levillain
dbfe39faa2 Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." 2019-03-14 13:17:46 +00:00
Nelson Li
fd71578493 Merge "Revert "Revert "Build System: Solve dependency problem for test""" am: 795721ac2a 
am: 3c4c86943c

Change-Id: I735cae7b8d68db780eac51868a1ef0fd9b22c5e9
 2019-03-13 21:39:07 -07:00
Nelson Li
3c4c86943c Merge "Revert "Revert "Build System: Solve dependency problem for test""" 
am: 795721ac2a

Change-Id: Ic5a66836b748dbe18a5b67a55896a0ae041dfc6c
 2019-03-13 21:34:55 -07:00
Treehugger Robot
795721ac2a Merge "Revert "Revert "Build System: Solve dependency problem for test""" 2019-03-14 04:23:32 +00:00
Nelson Li
1f8357fe7d Revert "Revert "Build System: Solve dependency problem for test"" 
This reverts commit 6fe7f194b9.

Reason for revert: Fixed all build break.

Change-Id: I0a4842df1225399752515a4cd7a7c14173a5bf7b
 2019-03-14 01:05:36 +00:00
Chih-hung Hsieh
aed44f5202 Merge "Accept the "file:(project:)?filePath" directive." am: cda227eeaf 
am: eb617633aa

Change-Id: I17e565cce7cc7c812f14710b1b2b54eb2bb193e2
 2019-03-13 14:05:17 -07:00
Chih-hung Hsieh
eb617633aa Merge "Accept the "file:(project:)?filePath" directive." 
am: cda227eeaf

Change-Id: I977f161f5879573bdcbe415fb25b2e994ba25d7e
 2019-03-13 14:02:07 -07:00
Chih-hung Hsieh
cda227eeaf Merge "Accept the "file:(project:)?filePath" directive." 2019-03-13 20:47:10 +00:00
Roland Levillain
43d2ca50ea Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS. 
These targets have been removed from ART Makefiles in 2018.

Test: n/a
Bug: 29282211
Bug: 77856586
Change-Id: I00ab00392d153242a67d0764e3ca2ba0528d79db
 2019-03-13 17:28:11 +00:00
Xin Li
ce31d6cce6 [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: a6d9bd539a -s ours 
am: ea1d10caec -s ours
am skip reason: subject contains skip directive

Change-Id: I6095c4057525bccc859d46ccf3df4580fde18e9d
 2019-03-12 22:52:20 -07:00
The Android Open Source Project
ee96a852ea [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 9205ecdbba -s ours 
am: 27479f1f30 -s ours
am skip reason: subject contains skip directive

Change-Id: I26ebd112bf9e4012cbb24f5364990fa18d1bad26
 2019-03-12 22:29:08 -07:00
Xin Li
ea1d10caec [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" 
am: a6d9bd539a -s ours
am skip reason: subject contains skip directive

Change-Id: I527748e396058eb3f8d9ac20a3b4916265c9e1c7
 2019-03-12 21:55:40 -07:00
The Android Open Source Project
27479f1f30 [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master 
am: 9205ecdbba -s ours
am skip reason: subject contains skip directive

Change-Id: Ie31f927cabd00222764e82c87270e51ba2e93aa5
 2019-03-12 21:21:32 -07:00
Xin Li
a6d9bd539a Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" 2019-03-13 02:26:04 +00:00
Chih-Hung Hsieh
cc47729719 Accept the "file:(project:)?filePath" directive. 
Test: checkowners.py some_owner_files
Bug: 126777637
Bug: 126761563
Change-Id: Iee03521681bc38fa28970a015058e1eba3c8b87a
 2019-03-12 11:56:33 -07:00
Daniel Norman
186ae7abb2 Merge "Adds support for optional config files to configure the merge." am: cf9509df01 
am: f03c76d047

Change-Id: Idfd4ff85e6d9c0ab9b80e2e5455890c7f724c150
 2019-03-12 10:11:22 -07:00
Daniel Norman
f03c76d047 Merge "Adds support for optional config files to configure the merge." 
am: cf9509df01

Change-Id: I67c1b99c582027e9993d9fe92acb94b4a66b80cd
 2019-03-12 10:07:13 -07:00
Daniel Norman
cf9509df01 Merge "Adds support for optional config files to configure the merge." 2019-03-12 16:53:31 +00:00
Daniel Norman
2c99c5bbd2 Adds support for optional config files to configure the merge. 
Bug: 124467065
Test: Running `python merge_target_files.py` using the three new flags
and observing that their contents are passed to the merge_target_files() function.
Change-Id: I4de46f041f5ae8bc8be2730313ce873a952bf78e
 2019-03-12 16:51:18 +00:00
Remi NGUYEN VAN
3ea98a1d22 Merge "Move NetworkStack in-process from lib to APK" am: c6bf520424 
am: 0dda351bf0

Change-Id: Ieec10d691d22c89135eb1a29cc4122bc6f373dc6
 2019-03-11 19:00:22 -07:00
Remi NGUYEN VAN
0dda351bf0 Merge "Move NetworkStack in-process from lib to APK" 
am: c6bf520424

Change-Id: I54fc8f10f22ae4fd45522224ac2351198df4e4f2
 2019-03-11 18:49:10 -07:00
Remi NGUYEN VAN
c6bf520424 Merge "Move NetworkStack in-process from lib to APK" 2019-03-12 01:37:26 +00:00
Adam Seaton
520b6c9fe6 [automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951 am: 796d90c141 -s ours 
am: 3d75a015a2

Change-Id: Ia14117c1d2730bd46cf6cc6c050682c9855096a4
 2019-03-11 16:03:18 -07:00
Adam Seaton
3d75a015a2 [automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951 
am: 796d90c141 -s ours
am skip reason: subject contains skip directive

Change-Id: I088058f32b6e2a990e1f4f6db432ed74adde43a6
 2019-03-11 15:52:56 -07:00
Adam Seaton
11b19b2cd5 Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev 
am: 53a4d16512

Change-Id: Iab27916732450121d68278e313a28f3507f3895f
 2019-03-11 15:42:24 -07:00
TreeHugger Robot
53a4d16512 Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev 2019-03-11 22:31:32 +00:00
Nelson Li
87a4a179e1 Merge "Revert "Build System: Solve dependency problem for test"" am: 8924400a8a 
am: abc1617463

Change-Id: Ic24d4cc0fddbc85a273c3050a35a2d09b741fc18
 2019-03-11 14:55:42 -07:00
Nelson Li
abc1617463 Merge "Revert "Build System: Solve dependency problem for test"" 
am: 8924400a8a

Change-Id: Ie4a572a1e2d8ab31552b31897d3062c2b7953ce1
 2019-03-11 14:21:37 -07:00
Elisa Pascual Trevino
9e6ce604c0 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951 am: 801e91776e -s ours 
am: d6e24caa47

Change-Id: I48c17bae57cf7241bd1690fea04ee448512200ce
 2019-03-11 14:15:03 -07:00
Elisa Pascual Trevino
21e7b04729 [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev Bug: 128322951 
am: 1159bb8b17

Change-Id: I6efcc5456bf46cf789c51fbcb87d8ffd15026f5f
 2019-03-11 14:14:21 -07:00
Elisa Pascual Trevino
d6e24caa47 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951 
am: 801e91776e -s ours
am skip reason: subject contains skip directive

Change-Id: Ia74fdd88bdd94c15f639685615ae4700f44fa870
 2019-03-11 14:12:07 -07:00
Pavel Salomatov
9a5bc48596 Merge "releasetools: Add compatibility for custom out directory." am: b6f2f8b2d9 
am: 0c470d3b8c

Change-Id: I984e29ff580ed1c361f22a7357c53dd4a24961c3
 2019-03-11 14:11:35 -07:00
Adam Seaton
796d90c141 [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev 
Bug:128322951
 2019-03-11 20:50:55 +00:00
Adam Seaton
7d44fc8d59 [DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev 
Bug:128322951
 2019-03-11 20:46:28 +00:00
Treehugger Robot
8924400a8a Merge "Revert "Build System: Solve dependency problem for test"" 2019-03-11 20:45:17 +00:00
Pavel Salomatov
0c470d3b8c Merge "releasetools: Add compatibility for custom out directory." 
am: b6f2f8b2d9

Change-Id: I93b394aed846563a54a9c83a3705f91ffbc2cc01
 2019-03-11 13:14:37 -07:00
Treehugger Robot
b6f2f8b2d9 Merge "releasetools: Add compatibility for custom out directory." 2019-03-11 19:51:14 +00:00
The Android Open Source Project
9205ecdbba DO NOT MERGE - Merge PPRL.190305.001 into master 
Bug: 127812889
Change-Id: I174b936518b6fd2a7687f200478fd63b09bfb860
 2019-03-11 11:13:56 -07:00
Elisa Pascual Trevino
801e91776e [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev 
Bug: 128322951
 2019-03-11 18:06:15 +00:00
Elisa Pascual Trevino
1159bb8b17 [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev 
Bug: 128322951
 2019-03-11 17:58:20 +00:00
Nelson Li
6fe7f194b9 Revert "Build System: Solve dependency problem for test" 
This reverts commit 224e103308.

Reason for revert: Build Breakage in git_pi-dev-plus-aosp/docs @5366136
make -j110 docs showcommands dist DIST_DIR=/buildbot/dist_dirs/git_pi-dev-plus-aosp-linux-docs/5366136 checkbuild
FAILED:
 Dependencies in out found with no rule to create them:
 out/target/product/generic/data/app/CtsVerifierTester/CtsVerifierTester.apk
 out/target/product/generic/data/app/TradeFedTestApp/TradeFedTestApp.apk
 out/target/product/generic/data/app/TradeFedUiTestApp/TradeFedUiTestApp.apk
 15:53:46 stopping
and
make -j50 showcommands dist TARGET_PRODUCT=cf_x86_phone DIST_DIR=/buildbot/dist_dirs/git_master-linux-ndk_translation_all/5366149 ndk_translation_all
FAILED: ninja: 'out/target/product/vsoc_x86/data/nativetest/arm/arm_insn_tests_arm_static/arm_insn_tests_arm_static', needed by 'out/target/product/vsoc_x86/obj/PACKAGING/ndk_translation_tests_intermediates/arm_insn_tests_arm_static_result.xml', missing and no known rule to make it
15:55:38 ninja failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: Idf95ef2e06526a0a31690420c923207db627605f
 2019-03-11 16:48:29 +00:00
SzuWei Lin
c72c066545 Merge "Fix some system property missing problem on aosp_* targets" am: bc1e820f25 
am: 37e3fd9887

Change-Id: If5ba2daf3cfb1e0bbd7b214b766b10cda9ce7b01
 2019-03-11 09:37:23 -07:00
SzuWei Lin
37e3fd9887 Merge "Fix some system property missing problem on aosp_* targets" 
am: bc1e820f25

Change-Id: I1e89dbe2a5b1630558257c3a2f15f477c15027db
 2019-03-11 09:23:33 -07:00
Pavel Salomatov
3267655004 releasetools: Add compatibility for custom out directory. 
sign_target_files_apks script looks for the signapk.jar inside the out dir.
If the our dir is set to a different directory via OUT_DIR_COMMON_BASE the script does not work properly.

From now script checks if the OUT_DIR_COMMON_BASE is set, then searches the jar in the proper path.
If OUT_DIR_COMMON_BASE is unset, searches in "out" like it did before.

Test: Build with OUT_DIR_COMMON_BASE set and unset and verify that sign_target_files_apks works in both cases

Change-Id: I9218b98ff79526184f8353705640193405afac9e
 2019-03-11 19:22:29 +03:00
Treehugger Robot
bc1e820f25 Merge "Fix some system property missing problem on aosp_* targets" 2019-03-11 16:10:22 +00:00
nelsonli
6e62c0bdaa Merge "Build System: Solve dependency problem for test" am: 15e76e3848 
am: 740ac49c83

Change-Id: I770273ff9ad1e0444085d4222a692b7cb455041d
 2019-03-11 08:30:24 -07:00
nelsonli
740ac49c83 Merge "Build System: Solve dependency problem for test" 
am: 15e76e3848

Change-Id: I3196c19640d92e72f947c45925969845f63daeb4
 2019-03-11 08:26:14 -07:00
Treehugger Robot
15e76e3848 Merge "Build System: Solve dependency problem for test" 2019-03-11 15:18:12 +00:00