Commit Graph

33540 Commits

Author SHA1 Message Date
Julien Desprez 63d377c56b Build CTS out of TF source
Export the TF jar build from source to the cts zip.

Test: build cts
Bug: 32819381
Change-Id: I4e1ccbd3a7ea27998a95986c1dd0348e01da60b6
2016-11-11 12:12:06 +00:00
Dan Willemsen d555c8aacb Merge "Fix vendor/google/build/ninja_config.mk" am: a9daf15d87 am: c87ea75be2 am: a8a8e13f81
am: 16953b869c

Change-Id: I2d75d6be8be9309f8534def7e3502601701d5eae
2016-11-11 06:02:02 +00:00
Dan Willemsen 16953b869c Merge "Fix vendor/google/build/ninja_config.mk" am: a9daf15d87 am: c87ea75be2
am: a8a8e13f81

Change-Id: I0593fea782aab91596d98a6da1502bce2d1649c4
2016-11-11 05:55:03 +00:00
Dan Willemsen a8a8e13f81 Merge "Fix vendor/google/build/ninja_config.mk" am: a9daf15d87
am: c87ea75be2

Change-Id: Ib813483882362a1165f6bbc287bde1a80cd519eb
2016-11-11 05:48:02 +00:00
Dan Willemsen c87ea75be2 Merge "Fix vendor/google/build/ninja_config.mk"
am: a9daf15d87

Change-Id: I15afdf34b43317b3566a3c390b09f57fafbadec9
2016-11-11 05:41:02 +00:00
Dan Willemsen a9daf15d87 Merge "Fix vendor/google/build/ninja_config.mk" 2016-11-11 05:35:05 +00:00
Dan Willemsen 1ff5fa11c4 Fix vendor/google/build/ninja_config.mk
This needs to be included between PARSE_TIME_MAKE_GOALS and KATI_GOALS

Test: m -j <target-from-internal>
Change-Id: I7284f05336b921d40f04ff5811a47bd0d17a066f
2016-11-10 19:41:27 -08:00
Dan Willemsen 10fcbc543d Merge changes I1bc291aa,Ib3ec8aa8 am: 0f185d7c3b am: b63b2021d6 am: 6dc0831d69
am: 53e46ba3ca

Change-Id: Id7545a93648ff6ba7cc0aa53c6d417ac30700fce
2016-11-10 23:23:49 +00:00
Dan Willemsen 0d93aeb2a7 Split (ninja|soong).mk into config and rule portions am: 04f53ed923 am: 0c3eaa8cf4 am: 206a26306d
am: c6bdb139d7

Change-Id: I7bd6fbf5d3682ae2d2a7a51c34ea2395f44eb326
2016-11-10 23:23:43 +00:00
Dan Willemsen c433023ab1 Move some configuration from main.mk to config.mk am: cfabc42af9 -s ours am: 827554c1de am: 826afd49fd
am: 4e27364d65

Change-Id: I97b7051bebe3a874873605ede9befe9f459d18e8
2016-11-10 23:23:38 +00:00
Dan Willemsen 53e46ba3ca Merge changes I1bc291aa,Ib3ec8aa8 am: 0f185d7c3b am: b63b2021d6
am: 6dc0831d69

Change-Id: Ibd08701b313bf31d4f144f225a9f3e3d1e00c59e
2016-11-10 23:17:47 +00:00
Dan Willemsen c6bdb139d7 Split (ninja|soong).mk into config and rule portions am: 04f53ed923 am: 0c3eaa8cf4
am: 206a26306d

Change-Id: I863436859163945ef2999814a091ca2c7f339b3c
2016-11-10 23:17:42 +00:00
Dan Willemsen 4e27364d65 Move some configuration from main.mk to config.mk am: cfabc42af9 -s ours am: 827554c1de
am: 826afd49fd

Change-Id: I2c35823527620c448b29888cbc7d6f01dc8a3982
2016-11-10 23:17:36 +00:00
Dan Willemsen 6dc0831d69 Merge changes I1bc291aa,Ib3ec8aa8 am: 0f185d7c3b
am: b63b2021d6

Change-Id: I747003c07cc763e44a0fded7ee2fc7ed9d39dd9c
2016-11-10 23:10:49 +00:00
Dan Willemsen 206a26306d Split (ninja|soong).mk into config and rule portions am: 04f53ed923
am: 0c3eaa8cf4

Change-Id: I947cecac51c77f8800981575324b341e2f4562a8
2016-11-10 23:10:43 +00:00
Dan Willemsen 826afd49fd Move some configuration from main.mk to config.mk am: cfabc42af9 -s ours
am: 827554c1de

Change-Id: If8fad8d067279ecff9a92bab5880196680093a51
2016-11-10 23:10:37 +00:00
Dan Willemsen b63b2021d6 Merge changes I1bc291aa,Ib3ec8aa8
am: 0f185d7c3b

Change-Id: Ib6cf95a7946d91c48299c1ef5092a49c231fcc4e
2016-11-10 23:04:14 +00:00
Dan Willemsen 0c3eaa8cf4 Split (ninja|soong).mk into config and rule portions
am: 04f53ed923

Change-Id: I5766f8a60440669c6cda418a4423d159c9697bcb
2016-11-10 23:04:13 +00:00
Dan Willemsen 827554c1de Move some configuration from main.mk to config.mk
am: cfabc42af9  -s ours

Change-Id: I66cff53cf96698e22064c4087e0e777137b3ad80
2016-11-10 23:04:07 +00:00
Dan Willemsen 0f185d7c3b Merge changes I1bc291aa,Ib3ec8aa8
* changes:
  Split (ninja|soong).mk into config and rule portions
  Move some configuration from main.mk to config.mk
2016-11-10 22:41:24 +00:00
Dan Willemsen d7db0ca758 Move some configuration from main.mk to config.mk am: 01a19a116f am: 0a2b2784a6
am: cc54ba0452

Change-Id: I53ba89f4b81b8833b53671d41a45b8970e87eb74
2016-11-10 21:07:03 +00:00
Dan Willemsen cc54ba0452 Move some configuration from main.mk to config.mk am: 01a19a116f
am: 0a2b2784a6

Change-Id: Ifae685fa3de7f418dd1d4a2060c6637fac2b670d
2016-11-10 21:00:20 +00:00
Dan Willemsen 0a2b2784a6 Move some configuration from main.mk to config.mk
am: 01a19a116f

Change-Id: I4918aa3465bd650ca74e2500b81bf1fee2fbcdac
2016-11-10 20:54:17 +00:00
Dan Willemsen 01a19a116f Move some configuration from main.mk to config.mk
When dumping make configuration (dump-many-var, dump-var-*), we only
load config.mk, not main.mk. One of the first things that main.mk does
is to include config.mk, so these moves are safe.

Turning off the implicit rules and other make configuration / sanity
checks should happen in all cases, so move them to config.mk

Move dont_bother_rules to config.mk so that it can be used by the ninja
configuration (which is moving in a later change). Move dont_bother into
the kati section, since it's not used elsewhere.

Test: m clean
Test: get_build_var dont_bother_goals
Change-Id: Ib3ec8aa8eebcaf743d2cdcc31f89827c4e8470a1
2016-11-10 03:32:37 +00:00
Dan Willemsen 04f53ed923 Split (ninja|soong).mk into config and rule portions
So that an external tool can read the configuration using
dump-many-vars, and write out the soong.variables file while only
loading config.mk.

Also remove dumpvar-% from PARSE_TIME_MAKE_GOALS, since it's only used
with CALLED_FROM_SETUP / config.mk. This provides an easy way to test
this change as well.

Test: get_build_var NINJA
Test: get_build_var ANDROID_GOALS
Test: get_build_var NINJA_GOALS
Test: get_build_var KATI_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-NINJA_GOALS" get_build_var NINJA_GOALS
Test: MAKECMDGOALS="droid sdk dumpvar-KATI_GOALS" get_build_var KATI_GOALS
Test: MAKECMDGOALS="out/build-a.ninja dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS
Test: get_build_var SOONG_MAKEVARS_MK
Test: get_build_var SOONG_VARIABLES
Test: CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core make -f build/core/config.mk out/soong/soong.variables showcommands
Test: Compare soong.variables from above, and before/after with `m`
Test: Compare out before/after with `m doesnotexist`
Test: `m dist doesnotexist`
Change-Id: I1bc291aa165297c930fe600067edad6ce4979210
2016-11-09 17:53:33 -08:00
Dan Willemsen cfabc42af9 Move some configuration from main.mk to config.mk
When dumping make configuration (dump-many-var, dump-var-*), we only
load config.mk, not main.mk. One of the first things that main.mk does
is to include config.mk, so these moves are safe.

Turning off the implicit rules and other make configuration / sanity
checks should happen in all cases, so move them to config.mk

Move dont_bother_rules to config.mk so that it can be used by the ninja
configuration (which is moving in a later change). Move dont_bother into
the kati section, since it's not used elsewhere.

Test: m clean
Test: get_build_var dont_bother_goals
Change-Id: Ib3ec8aa8eebcaf743d2cdcc31f89827c4e8470a1
2016-11-09 17:29:23 -08:00
Clay Murphy 4ca20fc658 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36" am: 98f15a70e9 am: 731df4f4f3 am: 74ea495250
am: ae9ee888d6

Change-Id: I488e1b12a0538922b597b9e082e76922d20f3cce
2016-11-09 21:48:00 +00:00
Clay Murphy ae9ee888d6 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36" am: 98f15a70e9 am: 731df4f4f3
am: 74ea495250

Change-Id: Ia3ea0ed44a535e33700d57da4a53268f7921a06b
2016-11-09 21:41:57 +00:00
Clay Murphy 74ea495250 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36" am: 98f15a70e9
am: 731df4f4f3

Change-Id: I921c3a3280c84ab98bc6bdde20b70a999946595f
2016-11-09 21:35:27 +00:00
Clay Murphy 731df4f4f3 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36"
am: 98f15a70e9

Change-Id: I19f35481e688b205790e4f2d817932422b72b93f
2016-11-09 21:29:57 +00:00
Clay Murphy 98f15a70e9 Merge "Creates a css nowrap class for non-breaking elements in source.android.com Test: build2stage 36" 2016-11-09 21:18:37 +00:00
Billy Lamberta 4d41e26a54 Creates a css nowrap class for non-breaking elements
in source.android.com
Test: build2stage 36

Change-Id: I467cc66d5e205b00ed188180140b1ae972e2ebad
2016-11-09 21:17:41 +00:00
Tao Bao 4f9bef7af5 Merge "releasetools: Use java_path in sign_target_files_apks.py." am: 4a71d500c1 am: dc04f93e39 am: 36f0b8daeb
am: 14b69f4ff5

Change-Id: I59ba285fef79bf6562b020a46f10710c9870a52a
2016-11-08 23:58:58 +00:00
Tao Bao 14b69f4ff5 Merge "releasetools: Use java_path in sign_target_files_apks.py." am: 4a71d500c1 am: dc04f93e39
am: 36f0b8daeb

Change-Id: I455bf056dd616c80b49e24a0d34885624fddb235
2016-11-08 23:53:27 +00:00
Tao Bao 36f0b8daeb Merge "releasetools: Use java_path in sign_target_files_apks.py." am: 4a71d500c1
am: dc04f93e39

Change-Id: Id86cdb3f7fdc771b9213d483d89dc6257a2225a5
2016-11-08 23:47:56 +00:00
Sandeep Patil da3cfe6c8e Merge "Add new 'charger' binary to default Android builds" 2016-11-08 23:45:15 +00:00
Tao Bao dc04f93e39 Merge "releasetools: Use java_path in sign_target_files_apks.py."
am: 4a71d500c1

Change-Id: I61400574ac3f7d29906ca571f497554631ecd72d
2016-11-08 23:42:26 +00:00
Tao Bao 4a71d500c1 Merge "releasetools: Use java_path in sign_target_files_apks.py." 2016-11-08 23:31:51 +00:00
Tao Bao e95540e060 releasetools: Use java_path in sign_target_files_apks.py.
Prior to this CL, it was calling the hard-coded "java" although it was
accepting a "--java_path" option.

Also switch OPTIONS.java_args from string to list. Otherwise it won't
work when providing multiple args.

Bug: 32737832
Test: Specify "--java_path=" and "--java_args" when invoking
      sign_target_files_apks.py with "-v". Check the commands being
      called.
Change-Id: Id7ef98e778646d532027434de7fba9b7a104dbd0
2016-11-08 12:48:43 -08:00
Ian Pedowitz 10195b7daf Merge "Adding some documentation to ensure methods are updated when API number is set" 2016-11-08 19:52:02 +00:00
Tao Bao e1204fd742 releasetools: Make BBOTA incremental generation repeatable. am: b4cd33fac9
am: 47c15ce469

Change-Id: I00406edb894b69e2da0ec88bc44984af61ffff41
2016-11-07 18:09:02 +00:00
Tao Bao 47c15ce469 releasetools: Make BBOTA incremental generation repeatable.
am: b4cd33fac9

Change-Id: I031f3d3d3d7d56407721d6b07a511ffc6e4cd658
2016-11-07 17:58:02 +00:00
Tao Bao b4cd33fac9 releasetools: Make BBOTA incremental generation repeatable.
set() doesn't keep elements according to the order of insertion. So
Transfers managed with set() in intermediate steps may not appear in the
same order across runs. This leads to slightly different output packages
when generating the same incremental OTA.

This CL fixes the issue by replacing set() with OrderedDict() in
blockimgdiff.GenerateDigraph() and blockimgdiff.FindVertexSequence().

It also adds a testcase that ensures blockimgdiff.GenerateDigraph()
preserves the insertion order for Transfer.goes_after set.

Bug: 32220816
Test: ota_from_target_files.py gives identical package when running
multiple times.

Change-Id: I56d551e5ca926993ab46896e33c80e0ce42e506a
(cherry picked from commit 3348228423)
2016-11-06 00:37:29 -07:00
Tao Bao f7b7e69d92 Merge "releasetools: compare size between compressed and patch while build otapackage" am: 49758959f2 am: 9242e1f750 am: aa4d046bb5
am: c9b8d96c5a

Change-Id: I0a143e1a7dabc732e9e18d2a7af9eb864eb7fc79
2016-11-05 00:24:27 +00:00
Tao Bao c9b8d96c5a Merge "releasetools: compare size between compressed and patch while build otapackage" am: 49758959f2 am: 9242e1f750
am: aa4d046bb5

Change-Id: If1e0b8622cf06b320dda5172ee53a57b2746ec5b
2016-11-05 00:20:55 +00:00
Tao Bao aa4d046bb5 Merge "releasetools: compare size between compressed and patch while build otapackage" am: 49758959f2
am: 9242e1f750

Change-Id: I75c3bf233934c9bf8d1313a66c86b620aab8abbd
2016-11-05 00:17:25 +00:00
Tao Bao 9242e1f750 Merge "releasetools: compare size between compressed and patch while build otapackage"
am: 49758959f2

Change-Id: I17b988878cc7ffdfbe490f404c9cd5ab996a8c5f
2016-11-05 00:13:55 +00:00
Tao Bao 49758959f2 Merge "releasetools: compare size between compressed and patch while build otapackage" 2016-11-05 00:09:35 +00:00
Tao Bao a45d083b14 Merge "releasetools: Make BBOTA incremental generation repeatable." am: b9bd78d110 am: e3554167e2 am: 91445e5886
am: cdb29d139c

Change-Id: I37160c1a061004aefa6ed3c887ab80c63fb11cad
2016-11-04 21:40:15 +00:00
Tao Bao cdb29d139c Merge "releasetools: Make BBOTA incremental generation repeatable." am: b9bd78d110 am: e3554167e2
am: 91445e5886

Change-Id: I13c0e04dd19b560132f4434ad7b7c8fd2db97adc
2016-11-04 21:36:45 +00:00