StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,000 Commits 1 Branch 0 Tags
6dd1058761723e11689af73f7b95f64d1adbcc07
Commit Graph

34000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bowgotsai
6dd1058761 Merge "custom_image: fix build break" am: 52897d4ecb am: ab0ae8e728 am: 882fc2c96a 
am: 5f58152b73

Change-Id: I0bf4729aa396a1566b555c6fe2e4dfeff31b0e72
 2016-12-07 03:38:30 +00:00
bowgotsai
5f58152b73 Merge "custom_image: fix build break" am: 52897d4ecb am: ab0ae8e728 
am: 882fc2c96a

Change-Id: Ie01865b817d2b87b9411a1ed82739d0b7b9a6a5a
 2016-12-07 03:34:30 +00:00
bowgotsai
882fc2c96a Merge "custom_image: fix build break" am: 52897d4ecb 
am: ab0ae8e728

Change-Id: I20aa30f30bafcfb49b39c0d69b87ed5e7e4ecae5
 2016-12-07 03:30:30 +00:00
bowgotsai
ab0ae8e728 Merge "custom_image: fix build break" 
am: 52897d4ecb

Change-Id: I40f0d7c6f935e33f7d076313d86df25fb5199087
 2016-12-07 03:26:30 +00:00
Treehugger Robot
52897d4ecb Merge "custom_image: fix build break" 2016-12-07 03:20:13 +00:00
TreeHugger Robot
d1fcbe4b5c Merge "Remove tradefed prebuilt dependancy" 2016-12-06 23:50:41 +00:00
Benoit Lamarche
a836253b72 Merge "Disable Jack's NNode cache" am: 3c731228ba am: fcf364b15a am: 90965a5f69 
am: 38b64f6567

Change-Id: I1f285c9ae89704fbf06b7bf7bc9c36ce9ec2c89f
 2016-12-06 16:05:16 +00:00
Benoit Lamarche
38b64f6567 Merge "Disable Jack's NNode cache" am: 3c731228ba am: fcf364b15a 
am: 90965a5f69

Change-Id: I2fd6bb30513f4d3c53f147894c399e2044b9ec52
 2016-12-06 16:01:46 +00:00
Benoit Lamarche
90965a5f69 Merge "Disable Jack's NNode cache" am: 3c731228ba 
am: fcf364b15a

Change-Id: Id19d1caf7ce00809f907dbca51fed607ebbe3f2d
 2016-12-06 15:58:15 +00:00
Benoit Lamarche
fcf364b15a Merge "Disable Jack's NNode cache" 
am: 3c731228ba

Change-Id: Iea59e0c4cd0fa11277913d70a9de698565ae13fc
 2016-12-06 15:54:45 +00:00
Benoit Lamarche
3c731228ba Merge "Disable Jack's NNode cache" 2016-12-06 15:47:35 +00:00
Benoit Lamarche
9e0d21d96b Disable Jack's NNode cache 
Test: N/A
Bug: 33367537
Change-Id: Idf7a518dfcbf5665917465b1ae2f0e09f4532688
 2016-12-06 15:00:03 +01:00
Benoit Lamarche
cd859b6ec6 resolve merge conflicts of e04c941 to stage-aosp-master am: 0e61b46673 am: dd80dde8d2 
am: 0de297d254

Change-Id: I778834c1e64a189b1d722fdc1ff2eada5a889c89
 2016-12-06 11:19:39 +00:00
Benoit Lamarche
0de297d254 resolve merge conflicts of e04c941 to stage-aosp-master am: 0e61b46673 
am: dd80dde8d2

Change-Id: Iff9f1ef1653a7a878dee9fb23dc7398e2b3805fc
 2016-12-06 11:16:05 +00:00
Benoit Lamarche
dd80dde8d2 resolve merge conflicts of e04c941 to stage-aosp-master 
am: 0e61b46673

Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb
 2016-12-06 11:11:58 +00:00
Benoit Lamarche
0e61b46673 resolve merge conflicts of e04c941 to stage-aosp-master 
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
 2016-12-06 11:32:41 +01:00
Benoit Lamarche
e04c941668 Merge "Set platform min sdk for Jack to o-b1" 2016-12-06 10:16:26 +00:00
bowgotsai
0f72bca96b custom_image: fix build break 
Fix build break caused by
https://android-review.googlesource.com/#/c/305575/.

Bug: 33358681
Test: make custom_images

Change-Id: I1ba7cf61491c8593b20bdac58e984f1928697b8c
 2016-12-06 17:36:31 +08:00
Benoit Lamarche
548ce2ce3a Merge "Set platform min sdk for Jack to o-b1" 2016-12-06 09:25:46 +00:00
Dan Willemsen
b19a745e6d Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534 am: 0deb783a52 am: 54eac255b9 
am: ca9eca2477

Change-Id: Ibbe144a99613d8f4f97f0663075f5943044e9d48
 2016-12-06 03:44:05 +00:00
Dan Willemsen
ca9eca2477 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534 am: 0deb783a52 
am: 54eac255b9

Change-Id: Ic11fff505eac936ec0e3897f8565fd65f4f917d4
 2016-12-06 03:40:35 +00:00
Dan Willemsen
54eac255b9 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" am: 47b0322534 
am: 0deb783a52

Change-Id: Icb3d257945201bdfdff1fb562d06faf3c009788d
 2016-12-06 03:36:34 +00:00
Dan Willemsen
0deb783a52 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" 
am: 47b0322534

Change-Id: I55ac26073caf34173f6c051f87e10b651c23589b
 2016-12-06 03:32:05 +00:00
Treehugger Robot
47b0322534 Merge "Tell Soong about TARGET_COPY_OUT_VENDOR" 2016-12-06 03:27:01 +00:00
Dan Willemsen
7cbe3bd688 Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 am: 55b1651181 am: 35ab684f8e 
am: 5b8f1db905

Change-Id: I1ba30e935af457bb4015b1aec9605a2c517bd05f
 2016-12-06 02:45:26 +00:00
Dan Willemsen
12fa3d37cc Merge "Soong now exports AIDL_CPP" am: 06a2daac72 am: f1e23b77f4 am: 66509c37dc 
am: 1aab680f2f

Change-Id: I1c4f9a1854909aa0848e89a30e9977e92370a0be
 2016-12-06 02:44:30 +00:00
Dan Willemsen
5b8f1db905 Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 am: 55b1651181 
am: 35ab684f8e

Change-Id: If0557ff6e3dcb44335ab781bec929846fbdf82a9
 2016-12-06 02:37:58 +00:00
Dan Willemsen
35ab684f8e Merge "Remove aidl, proto, objc from soong_problems" am: bbc072f716 
am: 55b1651181

Change-Id: Ia18925f8aebf81bcd8707d29f88eef5fa7b6cee0
 2016-12-06 02:34:58 +00:00
Dan Willemsen
1aab680f2f Merge "Soong now exports AIDL_CPP" am: 06a2daac72 am: f1e23b77f4 
am: 66509c37dc

Change-Id: I1687e78bdbdb11d1c39ddd4f5492f4276672b0a6
 2016-12-06 02:32:31 +00:00
Dan Willemsen
55b1651181 Merge "Remove aidl, proto, objc from soong_problems" 
am: bbc072f716

Change-Id: Ifba3b1ebb0e9ca018495fc1f93104823d51a516e
 2016-12-06 02:32:30 +00:00
Treehugger Robot
bbc072f716 Merge "Remove aidl, proto, objc from soong_problems" 2016-12-06 02:28:36 +00:00
Dan Willemsen
66509c37dc Merge "Soong now exports AIDL_CPP" am: 06a2daac72 
am: f1e23b77f4

Change-Id: I0aa93e2a1eb2803b46c70019eee23d08a47b4c9d
 2016-12-06 02:28:30 +00:00
Dan Willemsen
f1e23b77f4 Merge "Soong now exports AIDL_CPP" 
am: 06a2daac72

Change-Id: I704c568b71cd95c6a17545d6694095b72e5c097c
 2016-12-06 02:25:36 +00:00
Treehugger Robot
06a2daac72 Merge "Soong now exports AIDL_CPP" 2016-12-06 02:20:40 +00:00
Dan Willemsen
c077871f68 Tell Soong about TARGET_COPY_OUT_VENDOR 
So that it can properly install proprietary components in system/vendor/
or vendor/

Test: lunch aosp_arm-eng; m -j vulkan.default
Test: lunch aosp_flounder-eng; m -j vulkan.default
Change-Id: I98384d2b4f09c3b5de2ed04417880f366828234e
 2016-12-05 17:46:30 -08:00
Dan Willemsen
a1c3183455 Remove aidl, proto, objc from soong_problems 
We support these in Soong now, so stop marking them in soong_to_convert.

Test: Compare soong_to_convert.txt
Change-Id: I89befdfd8c4eaa04ab626d8be090765a1b879d8b
 2016-12-05 16:38:14 -08:00
Dan Willemsen
32b283171e Soong now exports AIDL_CPP 
So remove it here.

Test: mmma -j system/tools/aidl
Change-Id: Ia92ce6499881c1aec42900fcfdb4e790a67b62b5
 2016-12-05 15:16:38 -08:00
Adrien Schildknecht
0ef3d323d5 Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f am: 13f3b5337a 
am: f147e615ca

Change-Id: I8ef3e288ab4247d13fc655dc91f028e5ed5dadae
 2016-12-03 04:19:54 +00:00
Adrien Schildknecht
f147e615ca Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f 
am: 13f3b5337a

Change-Id: Ib9400831dd32ca00ab5c7ba9e115f6b5f9b0439f
 2016-12-03 04:15:00 +00:00
Adrien Schildknecht
13f3b5337a Manually merge commit 'c13da91' into stage-aosp-master 
am: ada51f3b8f

Change-Id: Idc324a9e89bd4bf7e099395a72b5868d7040d545
 2016-12-03 04:12:53 +00:00
The Android Automerger
ada51f3b8f Manually merge commit 'c13da91' into stage-aosp-master 
* commit 'c13da91':
  Add support for creating ext4 images with mke2fs

BUG:33304034
 2016-12-03 04:02:09 +00:00
Ray Essick
bc88eb67f7 Merge "add mediaanalytics service to build" 2016-12-03 00:49:31 +00:00
Treehugger Robot
c13da91023 Merge "Add support for creating ext4 images with mke2fs" 2016-12-02 22:48:23 +00:00
dcashman
a74a1656e6 Merge "Sort SELinux package inclusion." am: 15e1b5e239 am: d1b032237a am: 59f8c3f59a 
am: 00611df41b

Change-Id: I8da31f1e49eff18ed0c25f74d4266bcfc563ecfb
 2016-12-02 22:48:22 +00:00
Colin Cross
d9aae72d14 Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b am: 51c1eeefb3 am: 04158fac7c 
am: c2e68615e7

Change-Id: I883c75d41f89d19317fce27135d87de7eef0b6ba
 2016-12-02 22:48:02 +00:00
dcashman
00611df41b Merge "Sort SELinux package inclusion." am: 15e1b5e239 am: d1b032237a 
am: 59f8c3f59a

Change-Id: I18621f461565a3b30a884d54229502fd1ba15766
 2016-12-02 22:42:53 +00:00
dcashman
59f8c3f59a Merge "Sort SELinux package inclusion." am: 15e1b5e239 
am: d1b032237a

Change-Id: Ie3aaaa4ea5963c405b5363cf3258b3817390640a
 2016-12-02 22:40:54 +00:00
dcashman
d1b032237a Merge "Sort SELinux package inclusion." 
am: 15e1b5e239

Change-Id: I2411d85662baf7278d34955bd6eb7ae6938b1956
 2016-12-02 22:36:28 +00:00
Treehugger Robot
15e1b5e239 Merge "Sort SELinux package inclusion." 2016-12-02 22:25:42 +00:00
Colin Cross
c2e68615e7 Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b am: 51c1eeefb3 
am: 04158fac7c

Change-Id: Ib4ee0aeb0834fb248353d47859447f0988f09043
 2016-12-02 22:18:27 +00:00