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

30349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
2d208075c6 Merge \\\"Remove obsolete MTD support from the releasetools scripts.\\\" am: 63fc2b6766 am: ece6ff869c 
am: f66d3e61f8

Change-Id: Ib754bc3e9b1c895d431e3b7be9e5435bb6b05fb5
 2016-06-17 05:05:08 +00:00
Elliott Hughes
f66d3e61f8 Merge \\"Remove obsolete MTD support from the releasetools scripts.\\" am: 63fc2b6766 
am: ece6ff869c

Change-Id: I4b5f5b6a622a2fbb996861e8832e1fc1d12e6bf4
 2016-06-17 05:02:05 +00:00
Elliott Hughes
ece6ff869c Merge \"Remove obsolete MTD support from the releasetools scripts.\" 
am: 63fc2b6766

Change-Id: I26ed21479ab52d535bcc99b13e55a1476a02f76c
 2016-06-17 04:59:26 +00:00
Treehugger Robot
63fc2b6766 Merge "Remove obsolete MTD support from the releasetools scripts." 2016-06-17 04:47:47 +00:00
Elliott Hughes
305b088729 Remove obsolete MTD support from the releasetools scripts. 
Bug: http://b/29250988
Change-Id: I653dc306485c6b35411840b53211d42eb6d19e34
 2016-06-16 20:48:47 -07:00
Dan Willemsen
af4bb1ce78 Merge \\\"Add new Android.mk to handle repo move\\\" am: ab95c4a59d am: 821fb422cd 
am: ae4e49e500

Change-Id: Iaaf7a3b5f4be7669b6ddaeac782db335205c14da
 2016-06-16 23:50:01 +00:00
Dan Willemsen
ae4e49e500 Merge \\"Add new Android.mk to handle repo move\\" am: ab95c4a59d 
am: 821fb422cd

Change-Id: I5b1cbe0ea74171340cbfd46d8f8fe4cbf6d2578e
 2016-06-16 23:47:08 +00:00
Dan Willemsen
821fb422cd Merge \"Add new Android.mk to handle repo move\" 
am: ab95c4a59d

Change-Id: I435c234381c051846e78b2b1a7e305aa69918055
 2016-06-16 23:44:17 +00:00
Treehugger Robot
ab95c4a59d Merge "Add new Android.mk to handle repo move" 2016-06-16 23:25:46 +00:00
Dan Willemsen
c3622f921d Merge \\\"Remove build/libs\\\" am: fcb8a89c3b am: 3c48705b9b 
am: 947c5715f8

Change-Id: I16ff47ee232cfd37a0671e83c7684c04064831be
 2016-06-16 23:03:08 +00:00
Dan Willemsen
947c5715f8 Merge \\"Remove build/libs\\" am: fcb8a89c3b 
am: 3c48705b9b

Change-Id: I208cf823efc29610c2978719eed5ca44a16c6454
 2016-06-16 23:00:41 +00:00
Dan Willemsen
3c48705b9b Merge \"Remove build/libs\" 
am: fcb8a89c3b

Change-Id: Ib52f800fe84b7c3c8d060196713bd5677a9f791c
 2016-06-16 22:58:01 +00:00
Treehugger Robot
fcb8a89c3b Merge "Remove build/libs" 2016-06-16 22:49:35 +00:00
Dan Willemsen
c72dfe3cca Add new Android.mk to handle repo move 
We're moving the platform/build repository down a level, then symlinking
the directories and necessary files back into build/. So if we're still
in build/, keep searching for Android.mk files, otherwise stop, since
they'll be found through the symlinks.

Bug: 28001743
Change-Id: Ieea6e3b1fca265b548395c6af148ebb4efa43b0f
 2016-06-16 15:30:19 -07:00
Dan Willemsen
eb4431595c Remove build/libs 
There's only a single library, libhost, and it's only used by acp and
atree in build/tools, move it there.

Bug: 28001743
Change-Id: Ie404d2793710de4e265a6fa95d462c32d4042623
 2016-06-16 14:52:47 -07:00
Vikas Marwaha
d7d393b207 Merge \\"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401\\" into nyc-dev am: 44d50cac49 
am: 722ea61798  -s ours

Change-Id: I31314875e1646a0624ddbd91eba5727cbb94cdaa
 2016-06-16 21:30:35 +00:00
Vikas Marwaha
9c2d5dd1ee Merge \\"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401\\" into nyc-dev am: 44d50cac49 -s ours 
am: 47eaaf94bc

Change-Id: I06fa3b87358d4f381b132ac47a821ddad74b3bd4
 2016-06-16 21:30:06 +00:00
Vikas Marwaha
47eaaf94bc Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401\" into nyc-dev 
am: 44d50cac49  -s ours

Change-Id: Ie1d90bf2c7e69736a3aa9897adc88ec655ea83eb
 2016-06-16 21:25:00 +00:00
Vikas Marwaha
722ea61798 Merge \"Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401\" into nyc-dev 
am: 44d50cac49

Change-Id: Ia07917cbad3d180abdb8837960f247feaec2b134
 2016-06-16 20:56:00 +00:00
Vikas Marwaha
44d50cac49 Merge "Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: 26381401" into nyc-dev 2016-06-16 20:47:30 +00:00
Mohamad Ayyash
8256959769 Merge \\"squashfs: make disable-4k-align a parameter\\" into nyc-dev am: 8ebbc4e7e2 
am: 3336f9ae67

Change-Id: I6a81d1dfd2345adac498025d7ee335c9b4b044c6
 2016-06-16 20:33:10 +00:00
Mohamad Ayyash
44dc2a973f resolve merge conflicts of 8ebbc4e to nyc-mr1-dev 
am: 423862500b

Change-Id: I8f8dd48e52c1ab7cb3462725569cf7c1e0443d38
 2016-06-16 20:22:30 +00:00
Mohamad Ayyash
423862500b resolve merge conflicts of 8ebbc4e to nyc-mr1-dev 
Change-Id: I2349bb3fede317487227b16cb7c7b093a93a3876
 2016-06-16 13:11:45 -07:00
Mohamad Ayyash
3336f9ae67 Merge \"squashfs: make disable-4k-align a parameter\" into nyc-dev 
am: 8ebbc4e7e2

Change-Id: Ia5c59b7bfc7f2b25fa9b13c2ce52c1bd75ccecce
 2016-06-16 16:39:39 +00:00
Mohamad Ayyash
8ebbc4e7e2 Merge "squashfs: make disable-4k-align a parameter" into nyc-dev 2016-06-16 16:24:34 +00:00
Tao Bao
2d126ab2a4 Merge \\\"Support wiping userdata for A/B OTA packages.\\\" am: b727d5bb32 am: 4f2b227fae 
am: 7e5205f929

Change-Id: I1d921c74efdc697a2a58b0ac164ac44601e87257
 2016-06-16 15:55:58 +00:00
Dan Willemsen
c62e01831b Merge changes Ib6ffcc38,Ia58e6bc1 am: 3068a85962 am: 5da565a85a 
am: c4c3cc2ee9

Change-Id: I3f5443dbc7098f0cad17d16b4adc084064097bf1
 2016-06-16 15:55:58 +00:00
Tao Bao
7e5205f929 Merge \\"Support wiping userdata for A/B OTA packages.\\" am: b727d5bb32 
am: 4f2b227fae

Change-Id: Icf157b44ecda14a2c289d4826e5a55af67e805d5
 2016-06-16 15:53:20 +00:00
Dan Willemsen
c4c3cc2ee9 Merge changes Ib6ffcc38,Ia58e6bc1 am: 3068a85962 
am: 5da565a85a

Change-Id: Ib0c7157644c1d51f37b8c91c76adb35c2df00de6
 2016-06-16 15:53:20 +00:00
Tao Bao
4f2b227fae Merge \"Support wiping userdata for A/B OTA packages.\" 
am: b727d5bb32

Change-Id: I9d6e67c5e71b025f7cb9119b45f05c51f2cfd340
 2016-06-16 15:50:47 +00:00
Dan Willemsen
5da565a85a Merge changes Ib6ffcc38,Ia58e6bc1 
am: 3068a85962

Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
 2016-06-16 15:50:46 +00:00
Treehugger Robot
b727d5bb32 Merge "Support wiping userdata for A/B OTA packages." 2016-06-16 15:39:23 +00:00
Dan Willemsen
3068a85962 Merge changes Ib6ffcc38,Ia58e6bc1 
* changes:
  Check that NDK-built modules only link to NDK-built modules
  Add macros for printing pretty warnings/errors in rules
 2016-06-16 15:38:02 +00:00
Tao Bao
7c5dc578b3 Support wiping userdata for A/B OTA packages. 
update_engine now accepts POWERWASH=1 to schedule a factory reset in
the post-install phase. Hook up with the --wipe_user_data flag in the
OTA script.

Bug: 28700985
Change-Id: Ie73876a61db90d124d2af588d674757376e9aabc
(cherry picked from commit 38ca0be399)
 2016-06-15 23:19:52 -07:00
Tao Bao
73621c8214 Support wiping userdata for A/B OTA packages. 
am: 38ca0be399

Change-Id: Id1908bbbb475f5ae3bc16fc2da5120e7d205b0b6
 2016-06-16 03:49:34 +00:00
Dan Willemsen
b097fbed0a Check that NDK-built modules only link to NDK-built modules 
Modules built against the NDK should only link against modules also
built against the NDK (or link to the NDK prebuilts). This patch
attempts to catch these cases, and prints a large warning when this is
violated. Once the tree is cleaned up, this will change to an error.

Change-Id: Ib6ffcc38d9161abdbe45a58af26ba429fb6f1876
 2016-06-15 20:22:19 -07:00
Dan Willemsen
dd5a5d328b Add macros for printing pretty warnings/errors in rules 
Change-Id: Ia58e6bc1328c84e5f4ba1f6a2fd2d650e94e127e
 2016-06-15 20:22:19 -07:00
Tao Bao
38ca0be399 Support wiping userdata for A/B OTA packages. 
update_engine now accepts POWERWASH=1 to schedule a factory reset in
the post-install phase. Hook up with the --wipe_user_data flag in the
OTA script.

Bug: 28700985
Change-Id: Ie73876a61db90d124d2af588d674757376e9aabc
 2016-06-15 17:07:03 -07:00
Mohamad Ayyash
1b6d3485fc squashfs: make disable-4k-align a parameter 
BUG: 29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
 2016-06-15 16:37:21 -07:00
Dan Willemsen
5fcfc056ec Merge \\\"Fix kati --no_ignore_dirty usage\\\" am: a6f510c776 am: cf771ed98f 
am: 018d5d174a

Change-Id: I7349587756c88d6fafc18ef3b4d54bc9a30ca8e8
 2016-06-15 23:06:33 +00:00
Dan Willemsen
f9d5346b67 Merge \\\"Forbid libstdc++ on Linux and Darwin\\\" am: 7fba3347b9 am: 3cd95c708d 
am: bf4617c424

Change-Id: Ic959c7854c42eea8bbe026e360e050cffd896ade
 2016-06-15 23:06:32 +00:00
Dan Willemsen
018d5d174a Merge \\"Fix kati --no_ignore_dirty usage\\" am: a6f510c776 
am: cf771ed98f

Change-Id: I8d199811ed752acbf464016cdf23f5ca9d818a6d
 2016-06-15 22:57:48 +00:00
Dan Willemsen
bf4617c424 Merge \\"Forbid libstdc++ on Linux and Darwin\\" am: 7fba3347b9 
am: 3cd95c708d

Change-Id: I78315783b64ce9a1a796795af6f7818604367cf9
 2016-06-15 22:57:47 +00:00
Dan Willemsen
cf771ed98f Merge \"Fix kati --no_ignore_dirty usage\" 
am: a6f510c776

Change-Id: I3b33f8a4762c7f8867afb5812933c452cdfa16b2
 2016-06-15 22:55:02 +00:00
Dan Willemsen
3cd95c708d Merge \"Forbid libstdc++ on Linux and Darwin\" 
am: 7fba3347b9

Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
 2016-06-15 22:54:59 +00:00
Treehugger Robot
a6f510c776 Merge "Fix kati --no_ignore_dirty usage" 2016-06-15 22:41:32 +00:00
Dan Willemsen
7fba3347b9 Merge "Forbid libstdc++ on Linux and Darwin" 2016-06-15 22:38:30 +00:00
Dan Willemsen
3773b45c3b Fix kati --no_ignore_dirty usage 
Kati only supports a single use of --no_ignore_dirty, so we were
ignoring the SOONG_ANDROID_MK file, and only detecting changes to
SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both
of those makefiles.

Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
 2016-06-15 14:55:58 -07:00
Alex Klyubin
e31799e124 Merge \\\"Don\\\'t depend on Bouncy Castle.\\\" am: 1fb96c3ff5 am: 3b36c7960d 
am: 37a8cc5f51

Change-Id: I9dda235b0c6b9de7183a07c9b932f5a6a573281f
 2016-06-15 20:52:57 +00:00
Alex Klyubin
37a8cc5f51 Merge \\"Don\\'t depend on Bouncy Castle.\\" am: 1fb96c3ff5 
am: 3b36c7960d

Change-Id: Ib33cb3a8aaa94df96731a16f20a7ef5415f42a3f
 2016-06-15 20:48:11 +00:00