Commit Graph

589 Commits

Author SHA1 Message Date
Leandro Gracia Gil
4123e0886b Merge "Add the protobuf compiler binary to the Windows SDK build." 2014-08-26 18:53:23 +00:00
Ying Wang
00b44e517b Use arm64 kernel-qemu in sdk-android-arm64-v8a.atree.
Bug: 17105204
Change-Id: I80dcad8198926dd0b758d65bd8704eb4c6b39e8d
2014-08-19 09:33:45 -07:00
Leandro Gracia Gil
653fe8eb04 Add the protobuf compiler binary to the Windows SDK build.
Change-Id: I0acca9fc39b8b5528a1ca4bf25b0bacb32b515e2
2014-07-28 15:25:41 -07:00
Maurice Chu
6fee567b2f Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

Bug: 10674263

(cherry picked from commit 7b433ee4e4)

Change-Id: If33387af7b58da2f258eba1240a911483daa9c7e
2014-07-18 10:52:54 +00:00
Yohann Roussel
b16fd5a5f4 Add res folder to multidex SDK projects.
This will fix an error when importing thoses projects with ADT.

(cherry picked from commit 6fa1156b3b)

Change-Id: Ibcd570a3f4f3bd6c8c4fd263d2d18e2cec18b787
2014-07-17 16:44:30 +02:00
Yohann Roussel
96dc8db6e5 android-support-multidex-instrumentation in SDK.
(cherry picked from commit 6f57b24889)

Change-Id: Ic8e609c0025d86c873161b28d99bb0da2b6c2d27
2014-07-17 16:44:30 +02:00
Yohann Roussel
ef0e4f5a3b Add multidex ADT project to SDK.
(cherry picked from commit a6ca3cf29f)

Change-Id: I44cf397dbc5649d9d701e2f8524a322d74c2aaa6
2014-07-17 16:44:30 +02:00
Yohann Roussel
604bf1f185 Include android-support-multidex in SDK libs.
(cherry picked from commit 9e27887b60)

Change-Id: Ieb2901a633a687927a0c5a5db6d17896c3b86449
2014-07-17 16:44:30 +02:00
Raphael Moll
7d86138caa Change api-versions.xml generator source order.
The generator now takes files first from prebuilts/tools
and then if not found takes them from prebuilds/sdk.

Change-Id: Ia099c26202292537e92eaaaa5c26ad2916114f1e
2014-06-10 11:10:57 -07:00
Ying Wang
1e1b10acd1 Merge "Switch to SDK_HOST_ARCH" 2014-06-10 16:26:22 +00:00
Raphael Moll
4f8a38ed7a Generate api-versions.xml for lint.
Depends on:
- tools/base      I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc  I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c

Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
2014-06-09 15:59:58 -07:00
Ying Wang
e7db94431e Switch to SDK_HOST_ARCH
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.

Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
2014-06-09 15:03:04 -07:00
Raphael Moll
6ab8ef21b8 Merge "Move SDK system-image source.prop_templates in their own folder." 2014-06-04 21:30:14 +00:00
Steve Moyer
23a8adf276 DO NOT MERGE: Add SmsTest and mege emulator smoke tests
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-06-04 09:55:31 -07:00
Raphael Moll
26bcf6a511 Move SDK system-image source.prop_templates in their own folder.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
2014-06-03 17:30:16 -07:00
Raphael Moll
37433ac223 Add Build-Tools runtime.properties file.
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00
Raphael Moll
087ccb0152 Merge "Fix SDK repo to prevent mixing different targets." 2014-06-03 01:27:03 +00:00
Raphael Moll
4df9f469f7 Fix SDK repo to prevent mixing different targets.
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
2014-06-02 17:11:45 -07:00
Raphael Moll
937cfb4260 am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:57:55 +00:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-27 16:10:14 -07:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
2014-05-20 16:29:29 -07:00
Raphael Moll
e9a7920ca4 Fix SDK build.
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
2014-05-20 14:10:47 -07:00
Raphael Moll
8aa49aef8a am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
* commit 'f9f829e51afe3906458a81cb4efb75a051c64c04':
  SDK: support generating repository XML with latest XSD.
2014-05-16 20:09:40 +00:00
Raphael Moll
ea40d2f4c5 SDK: support generating repository XML with latest XSD.
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
2014-05-15 17:49:02 -07:00
Andrew Hsieh
3d34e6524e am 7b004d96: Merge "Add libcxx projects and compiler-rt to windows whitelist."
* commit '7b004d960657c15145ce1272f7a61c8ca4272cd1':
  Add libcxx projects and compiler-rt to windows whitelist.
2014-05-12 10:27:46 +00:00
Stephen Hines
d7d603fbbb Add libcxx projects and compiler-rt to windows whitelist.
Change-Id: I2d6189b4e9a0440330d1212dae9396b88b66ea3f
2014-05-09 14:45:58 -07:00
Xavier Ducrohet
557639cf11 am 2567045c: Merge "Remove SDK tools from build."
* commit '2567045c07dfae87fa53dfdc349681b5311d3522':
  Remove SDK tools from build.
2014-05-09 00:52:33 +00:00
Xavier Ducrohet
ce00253c5b Remove SDK tools from build.
(cherry picked from commit 1678734ef064893f28390fac16f4633d0fb7361a)

Change-Id: Ia689f66868de18341b863e19f2958434eb45ca59
2014-05-08 14:49:09 -07:00
Xavier Ducrohet
7fc13d7ad6 am 1cad9512: Merge "Fix repo script to ignore tools"
* commit '1cad951295f4b7bbd6edd8c1c5c7a791f7078033':
  Fix repo script to ignore tools
2014-05-08 19:32:31 +00:00
Xavier Ducrohet
d81eb5d833 Fix repo script to ignore tools
Change-Id: I80e6d5802f9a4633378d432eff3e91c2fcf83eeb
2014-05-08 12:26:20 -07:00
Raphael Moll
438cc639d0 Revert "win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE."
This reverts commit 4a747f67b0.
2014-05-05 14:57:16 -07:00
Raphael Moll
4a747f67b0 win_sdk: temporary disable ALL win_sdk build. DO NOT MERGE.
This deactivate building all the exe binaries
and prevents atree from running (both for dev.git
and sdk.git). This still results in a win_sdk folder
so that the sdk_repo rule can work, but the generated
sdk will only contain linux binaries and is not to be
used for production, obviously.

Change-Id: I99cd27a050278afae3b62d1ef34a0a1a542bfd1a
2014-05-03 19:07:57 +00:00
Raphael Moll
304c807058 am a783fe5f: Merge "Temporarily disable rs/bcc in win_sdk"
* commit 'a783fe5f2c4e053b92b51ea1725fb535eaae7b0b':
  Temporarily disable rs/bcc in win_sdk
2014-05-03 00:04:52 +00:00
Raphael Moll
c63c2d31ba Temporarily disable rs/bcc in win_sdk
Change-Id: Ic3c49f14098662c83167151a2abc7f46d847c67f
2014-05-02 12:21:17 -07:00
Bill Yi
23f68632c7 Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD 2014-04-29 11:33:09 -07:00
Steve Moyer
0b1a1f7b38 Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 2014-04-04 16:32:00 +00:00
Steve Moyer
6ded79d696 DO NOT MERGE: Add SmsTest and mege emulator smoke tests
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-04-03 16:02:56 -07:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools.
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
2014-04-03 10:09:53 -07:00
Alexander Lucas
9e924b6820 am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
  Added new samples to sdk.atree for march push
2014-03-14 04:14:08 +00:00
Alexander Lucas
7ae2eca4a0 am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '7a80e034839e02c295cb75c59c6af75e17dad238':
  Added new samples to sdk.atree for march push
2014-03-13 22:15:02 +00:00
Alexander Lucas
c4a6ecf00d Added new samples to sdk.atree for march push
Change-Id: Ic138c1ff32c86ebb48375cc07d0c138829c8a3f7
2014-03-10 14:49:49 -07:00
Alexander Lucas
97c8590ca8 Updating build metadata for march sample push.
Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
2014-03-07 15:00:38 -08:00
Alexander Lucas
b58b31037a am 47be1a3b: am fc1c6987: Updated sdk.atree to include new samples for feb sample launch
* commit '47be1a3bea5be0317e8af71f202cd37e16302c76':
  Updated sdk.atree to include new samples for feb sample launch
2014-02-08 18:34:51 +00:00
Alexander Lucas
fc1c69874c Updated sdk.atree to include new samples for feb sample launch
Change-Id: I71af239a0bf0f146345e243720d9e4300c5ed1f6
2014-02-06 14:45:32 -08:00
Deepanshu Gupta
319363611c am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit 'ce8ddf4f8af5228e3d36987a8d0d5a9b030e785d':
  Bundle Noto fonts with the SDK
2014-02-06 03:03:44 +00:00
Deepanshu Gupta
0363ab1f74 Merge "Bundle Noto fonts with the SDK" into klp-dev 2014-02-06 02:05:06 +00:00
Deepanshu Gupta
bc0b4a804f Bundle Noto fonts with the SDK
Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
2014-01-08 01:44:45 +00:00
Xavier Ducrohet
c7e44de196 am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
* commit 'cd171fd352aa8e6e1d1bc903038a81b7702f6d7a':
  Properly package the RS support bc file.
2014-01-07 10:06:49 -08:00
Xavier Ducrohet
7f15ddd546 Properly package the RS support bc file.
Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
2014-01-02 16:24:21 -08:00
Narayan Kamath
4ebf03711a am 1e18a584: Merge "Whitelist libziparchive for windows."
* commit '1e18a584efe16cd387c603738c47c0591532e8d9':
  Whitelist libziparchive for windows.
2013-12-11 09:40:02 -08:00