Commit graph

1407 commits

Author SHA1 Message Date
Colin Cross
16fec72dfc Move outputs of bootstrap modules in main stage to separate directory
Don't write to $buildDir/.bootstrap in the ninja file generated for
the main stage.

Test: examine main stage build.ninja file
Change-Id: I9c6183c9a434ff11d44cdd4f9844eae192ebfe03
2019-10-17 13:42:34 -07:00
Colin Cross
57ad23a0da Merge remote-tracking branch 'aosp/upstream' into master am: d2a5c6d5f2 am: 19ebe0019c am: 83fb250244
am: b26091a6a9

Change-Id: I718b34da516bfcc848bbc7a3e9ef735b5cf22f74
2019-10-02 14:58:02 -07:00
Colin Cross
b26091a6a9 Merge remote-tracking branch 'aosp/upstream' into master am: d2a5c6d5f2 am: 19ebe0019c
am: 83fb250244

Change-Id: Ibc6dab25b37a262400593d46c2d57fd7314a5d3d
2019-10-02 14:45:29 -07:00
Colin Cross
83fb250244 Merge remote-tracking branch 'aosp/upstream' into master am: d2a5c6d5f2
am: 19ebe0019c

Change-Id: I829a98caf401fe47f96da2f3f0567ca40ee9af3a
2019-10-02 13:52:57 -07:00
Colin Cross
19ebe0019c Merge remote-tracking branch 'aosp/upstream' into master
am: d2a5c6d5f2

Change-Id: I74697189fa6527abe3f39bd85dffcfaaf1a11289
2019-10-02 13:25:37 -07:00
Colin Cross
d2a5c6d5f2 Merge remote-tracking branch 'aosp/upstream' into master
* aosp/upstream:
  Add proptools.FilterPropertyStruct
  Make CreateModule return the newly created module
  Add proptools.Int and proptools.IntDefault

Test: m checkbuild
Change-Id: I4bbd45be12794c1a8575799950772d4ecd272628
2019-09-26 14:59:43 -07:00
colincross
2f55f24c46
Merge pull request #264 from colincross/create_module
Make CreateModule return the newly created module
2019-09-26 14:30:11 -07:00
colincross
93322c4d7b
Merge pull request #266 from colincross/filter
Add proptools.FilterPropertyStruct
2019-09-26 14:29:04 -07:00
Colin Cross
1907836ad9 Add proptools.FilterPropertyStruct
Move some code from Soong to support creating a property struct
at runtime by filtering fields out of another property struct.

Test: TestFilterPropertyStruct
Change-Id: Ic5ae390a885195bebad6f3ecb7c752c0582a60b1
2019-09-26 14:21:40 -07:00
colincross
5639ec157c
Merge pull request #265 from colincross/int_default
Add proptools.Int and proptools.IntDefault
2019-09-26 10:41:52 -07:00
Colin Cross
6af7284d08 Make CreateModule return the newly created module
Allow mutators to modify properties of the newly created module
by returning it.

Change-Id: Ia1acc70b6196195d1bad58c88ab3def70b99e42c
2019-09-25 14:53:25 -07:00
Colin Cross
66c0b13553 Add proptools.Int and proptools.IntDefault
Add proptools.Int and proptools.IntDefault that behave analogously
to proptools.String and proptools.StringDefault.

Change-Id: I41fd3417c973c9ff4a5aa6680546b4b893784745
2019-09-25 14:52:54 -07:00
Jiyong Park
dfb5f47852 Merge remote-tracking branch 'aosp/upstream' am: a67e8c98e4 am: df092ed437 am: 465406a2f0
am: 1ad10edb64

Change-Id: Icd4c54e0640ba08f20cfa2249fb0a50ba9c600f2
2019-09-22 22:23:10 -07:00
Jiyong Park
1ad10edb64 Merge remote-tracking branch 'aosp/upstream' am: a67e8c98e4 am: df092ed437
am: 465406a2f0

Change-Id: Ie8fa7c370abb3eca3cac2743b6fd265265e6cc6f
2019-09-22 22:16:38 -07:00
Jiyong Park
465406a2f0 Merge remote-tracking branch 'aosp/upstream' am: a67e8c98e4
am: df092ed437

Change-Id: I82feb9462ac095644d9664b33f8ae3903b4b44ea
2019-09-22 22:10:09 -07:00
Jiyong Park
df092ed437 Merge remote-tracking branch 'aosp/upstream'
am: a67e8c98e4

Change-Id: I310d5abe2c17e0abdc7800fc7036eb946bb25e6b
2019-09-22 22:02:39 -07:00
Jiyong Park
a67e8c98e4 Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Don't ignore local variations when creating reverse dep
  Added VisitDirectDeps* methods to SingletonContext.

Test: m
Change-Id: I4832a523588c3095b077b89d2ecb4068b490fed4
2019-09-23 10:02:22 +09:00
colincross
884e7374fb
Merge pull request #263 from jiyongp/reverse_dep
Don't ignore local variations when creating reverse dep
2019-09-22 17:11:21 -07:00
Jiyong Park
df4ed95f43 Don't ignore local variations when creating reverse dep
This fixes a bug that reverse dependency can't be made for modules
having local variations. Previously, when module A having local variants
calls AddReverseDependency to module B having local variants, the match
is tested between the non-local variants of module A against all
variants of module B, which can never be successful.

This change fixes it by using all variants of module A when
findMatchingVariants is called for AddReverseDependency.

Test: m
Change-Id: Ib289188a5dd58c72bd6ba07e3c0f825f8b1c6b1b
2019-09-22 07:44:52 +09:00
colincross
658e01c1d7
Merge pull request #262 from skvadrik/master
Added VisitDirectDeps* methods to SingletonContext.
2019-09-21 08:17:02 -07:00
Ulya Trafimovich
811381a585 Added VisitDirectDeps* methods to SingletonContext.
A an example use case is generating the graph of module
dependencies, where modules are vertices and dependencies
are edges.

The patch was tested with a local implementation of such
a module in the Soong build system. The graph was generated
for all modules in the AOSP tree.
2019-09-20 23:58:23 +01:00
Xin Li
b345d95717 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: eb03bacf3f -s ours am: ba1c448eaa -s ours
am: d52d9b65d7 -s ours
am skip reason: change_id I76dd2fa706c67da7973cbc500142f7f5c597a3cb with SHA1 47653a7b0b is in history

Change-Id: I5e0edbac4dfde919fe10dd26f0ebd0ea7ef8bfe9
2019-09-08 16:10:08 -07:00
Xin Li
d52d9b65d7 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: eb03bacf3f -s ours
am: ba1c448eaa -s ours
am skip reason: change_id I76dd2fa706c67da7973cbc500142f7f5c597a3cb with SHA1 47653a7b0b is in history

Change-Id: I68802948814099b8c9bc1b5b7b0d434ddc92cfda
2019-09-08 15:49:12 -07:00
Xin Li
ba1c448eaa [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: eb03bacf3f -s ours
am skip reason: change_id I76dd2fa706c67da7973cbc500142f7f5c597a3cb with SHA1 47653a7b0b is in history

Change-Id: Ib7bcca8bcee122112b3a36795ad1246bd58a333c
2019-09-08 15:06:38 -07:00
Xin Li
eb03bacf3f Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
No content change.

Bug: 135460123
Change-Id: I1d55f13253683d4716eadfbc134cac8b9eddfa05
Merged-In: I76dd2fa706c67da7973cbc500142f7f5c597a3cb
2019-09-08 12:42:27 -07:00
Colin Cross
8dc313791e Merge remote-tracking branch 'aosp/upstream' am: 18efe1bc65 am: 47653a7b0b am: 24a6418475
am: e4c8e32965

Change-Id: Ic07b819dfb512a2fd3259a9d8cd0295e0658d3f9
2019-09-06 20:06:34 -07:00
Dan Willemsen
14cee4bc8e Merge remote-tracking branch 'aosp/upstream' am: 979da91acc am: 6e1bcf0472 am: 51f520ab73
am: c91a354c0f

Change-Id: I2b2895d7f94ce7d853a548572a2ccfb7916d5c72
2019-09-06 20:06:29 -07:00
Colin Cross
e4c8e32965 Merge remote-tracking branch 'aosp/upstream' am: 18efe1bc65 am: 47653a7b0b
am: 24a6418475

Change-Id: I0d86ed9d282a12461b9fb355cfa6d72ad2e5dcbc
2019-09-06 19:59:32 -07:00
Dan Willemsen
c91a354c0f Merge remote-tracking branch 'aosp/upstream' am: 979da91acc am: 6e1bcf0472
am: 51f520ab73

Change-Id: I1838744fc542804358a26685185a982500d57822
2019-09-06 19:59:27 -07:00
Colin Cross
24a6418475 Merge remote-tracking branch 'aosp/upstream' am: 18efe1bc65
am: 47653a7b0b

Change-Id: If34913f1303370cebbd4c7c43744edc48f99bedd
2019-09-06 19:52:31 -07:00
Dan Willemsen
51f520ab73 Merge remote-tracking branch 'aosp/upstream' am: 979da91acc
am: 6e1bcf0472

Change-Id: I19c60e56dd2c956aaedbe97e8e4f7482a6914119
2019-09-06 19:52:27 -07:00
Colin Cross
47653a7b0b Merge remote-tracking branch 'aosp/upstream'
am: 18efe1bc65

Change-Id: I76dd2fa706c67da7973cbc500142f7f5c597a3cb
2019-09-06 19:45:29 -07:00
Dan Willemsen
6e1bcf0472 Merge remote-tracking branch 'aosp/upstream'
am: 979da91acc

Change-Id: Ic30db67a14e4c6aa7ebcfe2d8d14dc3f0e573983
2019-09-06 19:45:26 -07:00
Colin Cross
18efe1bc65 Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Fix compiling binaries with go 1.13

Test: treehugger
Change-Id: Ib600e4a950ed5a0c163946a023f70a611eaad696
2019-09-06 16:07:24 -07:00
colincross
87050d9327
Merge pull request #261 from colincross/go1.13
Fix compiling binaries with go 1.13
2019-09-06 14:43:56 -07:00
Colin Cross
a2bc585afe Fix compiling binaries with go 1.13
The go compile command in go 1.13 needs -p main instead of
-p $pkgPath when compiling binaries.  This also works for older
go releases.

Also turn on travis for go 1.13.

Change-Id: I45ce185aa44cfa01a7933cc6e52290a85c851641
2019-09-06 14:25:28 -07:00
Dan Willemsen
979da91acc Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Fix checkCalledFromInit

Test: treehugger
Test: cd build/soong/apex; go test ./... (with go 1.13rc1)
Change-Id: Ibaaee1656c6139cc015b86b1f78c849d00d964fc
2019-09-06 11:07:37 -07:00
Dan Willemsen
3f22fcf3a8
Merge pull request #260 from jooyunghan/fix-caller
Fix checkCalledFromInit
2019-09-06 09:36:39 -07:00
Jooyung Han
5dd43cf9b4 Fix checkCalledFromInit
This function checks if it is called from init() by looking into
callers. By the way, it may fail when init() is inlined.

To fix this, CallersFrames() is used to translate PCs into symbolic
information accounting for inlined functions.

Test: go test ./...
Change-Id: I18b3c3ffdaf71f775e3522c87607aec5df7b09c5
2019-09-05 18:10:37 +09:00
Jiyong Park
71419f2bb8 [automerger skipped] Add SetDefaultDependencyVariation am: ba1ea75839 -s ours
am: 2158103ede -s ours
am skip reason: change_id I2c79c3c9e0437fd785b06ca20f43da2963d50b68 with SHA1 1a01946bf1 is in history

Change-Id: I76923eb2501085410386a358f123ea5a11010f18
2019-08-16 18:03:31 -07:00
Jiyong Park
2158103ede [automerger skipped] Add SetDefaultDependencyVariation
am: ba1ea75839 -s ours
am skip reason: change_id I2c79c3c9e0437fd785b06ca20f43da2963d50b68 with SHA1 1a01946bf1 is in history

Change-Id: I3c2ea2309b23ecff2dde2ac811abcc5510c33f77
2019-08-16 17:54:00 -07:00
Jiyong Park
ba1ea75839 Add SetDefaultDependencyVariation
SetDefaultDependencyVariation sets the variation name that will be used
when a dangling dependency is found while a module is being split. A
dangling dependency can occur if a module is split to a variant that one
of its dependencies is not split into. When the default variation is not
set, such dangling dependency is a hard error. But with the new
function, the default variation can be set and subsequent calls to
CreateVariations and its variations on the same context uses the default
variation when necessary.

(If even the default variation does not exist for the dependent module,
it is an hard error)

Note that this is different from calling SetDependencyVariation("foo")
followed by CreateVariations("foo", "bar"). In that case, regardless of
whether a dependency of the current module has the variant 'bar' or not,
only the 'foo' variant is chosen.

With SetDefaultDependencyVariation("foo") followed by
CreateVariations("foo", "bar"), 'foo' variant is used only when the
'bar' variant of the current module depends on a module that does not
have 'bar' variant.

Bug: 138103882
Test: m
Merged-In: I2c79c3c9e0437fd785b06ca20f43da2963d50b68
(cherry picked from commit 1e2e56dc62)
Change-Id: I4520ca87487994de024fdbacda3bef6636225f0d
2019-08-16 13:45:44 +09:00
Xin Li
4f693af01b [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 8f656270df -s ours am: 23721d6ca6 am: 9f179fcc6b
am: f00506ba9b -s ours
am skip reason: subject contains skip directive

Change-Id: I25cbdd38891683eba2f59b88b487a30394c176e2
2019-08-14 14:52:33 -07:00
Xin Li
f00506ba9b [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 8f656270df -s ours am: 23721d6ca6
am: 9f179fcc6b

Change-Id: I8cc8c200776cab2ae3087abcc92f67b867b2ff47
2019-08-14 14:07:57 -07:00
Xin Li
9f179fcc6b [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: 8f656270df -s ours
am: 23721d6ca6

Change-Id: Ib63f90d1c510be6d1f3bab8a9b0d3b5354749cb9
2019-08-14 13:43:04 -07:00
Xin Li
23721d6ca6 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
am: 8f656270df -s ours
am skip reason: subject contains skip directive

Change-Id: Icac25c09de5cacb4316941906e37c1fafa630a66
2019-08-14 13:17:58 -07:00
Xin Li
8f656270df DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
Bug: 134405016
Change-Id: I3a642d601437cfc7deb70f5d85bc8085c55f0ab1
2019-08-14 11:35:07 -07:00
Colin Cross
acbce89484 Merge remote-tracking branch 'aosp/upstream' into master am: 1a01946bf1 am: 076915c7da am: cd44450457 am: fc1915afaa
am: 1e49967576

Change-Id: I67491a8fef4a00748212bcdfa840d7b7f33a2378
2019-08-09 21:10:14 -07:00
Colin Cross
1e49967576 Merge remote-tracking branch 'aosp/upstream' into master am: 1a01946bf1 am: 076915c7da am: cd44450457
am: fc1915afaa

Change-Id: If7d93f7056676915a1c5d40f6eb96d42fe5c3ae3
2019-08-09 20:57:45 -07:00
Colin Cross
fc1915afaa Merge remote-tracking branch 'aosp/upstream' into master am: 1a01946bf1 am: 076915c7da
am: cd44450457

Change-Id: I4f2b4122b79a73a37add3a3fa12e15db097e5f64
2019-08-09 20:47:50 -07:00