Commit Graph

1813 Commits

Author SHA1 Message Date
Mike Lockwood
d6326b5788 Ignore compiled python files.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-07 13:26:52 -04:00
Android (Google) Code Review
230a15e397 am 8597204: Merge change 1015 into donut
Merge commit '85972041d04b24f26000c5504c1afe9d824b6c9a'

* commit '85972041d04b24f26000c5504c1afe9d824b6c9a':
  Make the simulator handle paths like '//data/data/...' the same way the device does.
2009-05-06 13:58:07 -07:00
Android (Google) Code Review
85972041d0 Merge change 1015 into donut
* changes:
  Make the simulator handle paths like '//data/data/...' the same way the device does.
2009-05-06 13:55:42 -07:00
Android (Google) Code Review
5325e11ae2 am a123cea: Merge change 1002 into donut
Merge commit 'a123cea7c82ec10cb1cbc027fc07352b922dff0e'

* commit 'a123cea7c82ec10cb1cbc027fc07352b922dff0e':
  runtest.py bug fixes.
2009-05-06 12:04:22 -07:00
Brett Chabot
6c6c1ab5fd Manual merge of runtest fixes in donut and new account test def add in master.
commit 8a101cb057
Author: Brett Chabot <brettchabot@google.com>
Date:   Tue May 5 12:56:39 2009 -0700

    runtest.py bug fixes.

    Improved error handling, and added support for "size" and "package" arguments.
    Removed deprecated runtest shell script.
2009-05-06 11:45:33 -07:00
Android (Google) Code Review
a123cea7c8 Merge change 1002 into donut
* changes:
  runtest.py bug fixes.
2009-05-06 10:31:01 -07:00
Marco Nelissen
47acf13773 Make the simulator handle paths like '//data/data/...' the same way the device does. 2009-05-05 14:54:14 -07:00
Raphael
9ad2ed9773 am 1bb52f2: Fix ADT junit test for AndroidManifestParser following API c
Merge commit '1bb52f25870a0f183b9c5a24362c2468fb316435'

* commit '1bb52f25870a0f183b9c5a24362c2468fb316435':
  Fix ADT junit test for AndroidManifestParser following API change.
2009-05-05 13:59:21 -07:00
Raphael
1bb52f2587 Fix ADT junit test for AndroidManifestParser following API change. 2009-05-05 13:41:59 -07:00
Brett Chabot
8a101cb057 runtest.py bug fixes.
Improved error handling, and added support for "size" and "package" arguments.
Removed deprecated runtest shell script.
2009-05-05 13:06:00 -07:00
Raphael
955d82083f am 816ba07: ADT #1825491: Provide default choices for <uses-library>
Merge commit '816ba073c618e4f1c2085451d117d463e71680a0'

* commit '816ba073c618e4f1c2085451d117d463e71680a0':
  ADT #1825491: Provide default choices for <uses-library>
2009-05-04 15:58:21 -07:00
Raphael
816ba073c6 ADT #1825491: Provide default choices for <uses-library>
We currently hardcode a list in the PlatformTarget and propagate
it to the UI via the AndroidTargetParser. This way we can later
decide to actually get the info from some kind of manifest.
2009-05-04 15:37:40 -07:00
Android (Google) Code Review
30354ed358 am 70c31ea: Merge change 947 into donut
Merge commit '70c31eae8c5fa014bc01027c63325af1e7ebe44b'

* commit '70c31eae8c5fa014bc01027c63325af1e7ebe44b':
  IDE: Add ConfigBuildFlags to Eclipse's .classpath
2009-05-04 13:59:42 -07:00
Android (Google) Code Review
70c31eae8c Merge change 947 into donut
* changes:
  IDE: Add ConfigBuildFlags to Eclipse's .classpath
2009-05-04 13:58:09 -07:00
Dave Bort
d69d3a1b8e IDE: Add ConfigBuildFlags to Eclipse's .classpath
Signed-off-by: Dave Bort <dbort@android.com>
2009-05-04 13:51:45 -07:00
Android (Google) Code Review
cddee7597f am 106e79f: Merge change 889 into donut
Merge commit '106e79fa3fcd5eae06d57c2dacc34883e60617a7'

* commit '106e79fa3fcd5eae06d57c2dacc34883e60617a7':
  Broaden the search for native test files.
2009-05-04 11:36:34 -07:00
Android (Google) Code Review
106e79fa3f Merge change 889 into donut
* changes:
  Broaden the search for native test files.
2009-05-04 11:34:51 -07:00
Nicolas Catania
ff096c1b7b Broaden the search for native test files.
Previously we were looking for test files with this pattern: test_*
I added *_test.[cc|cpp] and *_unittest.[cc|cpp]

The search also scan all the subdirectories of the build_path from
the test definition.

I added a filtering stage where missing tests are ignored.
For instance we may have a source file that has not been built for
the target, in which case it is ignored when we run the target tests.

In android_build.py I added 4 helper functions to get access to the
build environment:
- GetHostBin
- GetProductOut
- GetTargetSystemBin
- GetHostOsArch

Replace all the hardcoded linux-x86 strings with the value returned
by GetHostOsArch.
2009-05-02 09:10:44 -07:00
David Warren
26768bc8f9 am 39bd4dd: am 01a62ee: AI 148202: Applying changes to build_new_device.
Merge commit '39bd4dd798c9dbcaf9b37248dd3d3f56dc1bb4af'

* commit '39bd4dd798c9dbcaf9b37248dd3d3f56dc1bb4af':
  AI 148202: Applying changes to build_new_device.jd originally made by Reena in CL 148100. I made her edits by hand. The problem is that I moved all content files from docs to docs/guide and she edited the version in docs (which no longer exists).
2009-05-01 23:10:13 -07:00
David Warren
39bd4dd798 am 01a62ee: AI 148202: Applying changes to build_new_device.jd originall
Merge commit '01a62eeda8f2065aaf26a02decc615c19b63e967' into donut

* commit '01a62eeda8f2065aaf26a02decc615c19b63e967':
  AI 148202: Applying changes to build_new_device.jd originally made by Reena in CL 148100. I made her edits by hand. The problem is that I moved all content files from docs to docs/guide and she edited the version in docs (which no longer exists).
2009-05-01 14:22:21 -07:00
David Warren
01a62eeda8 AI 148202: Applying changes to build_new_device.jd originally made by Reena in CL 148100. I made her edits by hand. The problem is that I moved all content files from docs to docs/guide and she edited the version in docs (which no longer exists).
Automated import of CL 148202
2009-05-01 14:22:07 -07:00
Raphael
b55cd69033 am beb3214: ADT #1823896: Ability to add an "extra" action to the AVD Se
Merge commit 'beb3214b46e18bb461760c47f04c5b909557d060'

* commit 'beb3214b46e18bb461760c47f04c5b909557d060':
  ADT #1823896: Ability to add an "extra" action to the AVD Selector.
2009-05-01 14:08:07 -07:00
Raphael
beb3214b46 ADT #1823896: Ability to add an "extra" action to the AVD Selector.
Used to display the AVD Manager from the Device Chooser/Launch config.
Used to delete AVDs from the AVD Manager.

In AVD Manager, also hide the Cancel button since actions are
immediate and not cancelable.
2009-05-01 13:58:31 -07:00
Android (Google) Code Review
7e5591e788 am d1a3675: Merge change 856 into donut
Merge commit 'd1a367549baba493f2d87c2377e09323b929e772'

* commit 'd1a367549baba493f2d87c2377e09323b929e772':
  Modified the command to run native test on the host:
2009-05-01 11:59:00 -07:00
Android (Google) Code Review
d1a367549b Merge change 856 into donut
* changes:
  Modified the command to run native test on the host: - when valgrind is used, the output is discarded, always. - otherwise, the output of the test is printed only when the test failed.
2009-05-01 11:09:46 -07:00
Nicolas Catania
1ecf93b37a Modified the command to run native test on the host:
- when valgrind is used, the output is discarded, always.
- otherwise, the output of the test is printed only when the test failed.
2009-04-30 19:27:52 -07:00
David Warren
ad1f008bbb am 140eed1: am 2b15cf1: AI 148129: Missing \ in Pdk.Mk causing build to
Merge commit '140eed1ac513d26debca9ec92ffaea930a4c1736'

* commit '140eed1ac513d26debca9ec92ffaea930a4c1736':
  AI 148129: Missing \ in Pdk.Mk causing build to not go through - Gaurav
2009-04-30 18:24:37 -07:00
Reena Lee
381f4c95e9 am 7e2a21a: am 390be0e: AI 148128: -Removed "Option1" about using builds
Merge commit '7e2a21adcc304b9aea01a9dc68af384fde5c314e'

* commit '7e2a21adcc304b9aea01a9dc68af384fde5c314e':
  AI 148128: -Removed "Option1" about using buildspec which is no longer relevant.
2009-04-30 18:24:36 -07:00
David Warren
a0dc68cb6c am a8300ee: am 1b4feb4: AI 148118: 2 new debugging docs.
Merge commit 'a8300ee2fcfc2535a0688a1bac687c0c6ee82dbd'

* commit 'a8300ee2fcfc2535a0688a1bac687c0c6ee82dbd':
  AI 148118: 2 new debugging docs.
2009-04-30 18:24:36 -07:00
The Android Open Source Project
cc72f0dfcb hand merge b70a012, ignoring pdk/docs/source_setup_guide.jd 2009-04-30 18:23:05 -07:00
David Warren
bab3127382 am 969e009: am 5f6ca4f: AI 148105: Assigning to Ryan for Dr No Approval.
Merge commit '969e009757c58a9f806f88f04fc6071150ae7478'

* commit '969e009757c58a9f806f88f04fc6071150ae7478':
  AI 148105: Assigning to Ryan for Dr No Approval.
2009-04-30 18:11:17 -07:00
Android (Google) Code Review
bf0be65da0 am 7d64517: Merge change 839 into donut
Merge commit '7d645177b5946f2f4b0491462f0046492a1cf43c'

* commit '7d645177b5946f2f4b0491462f0046492a1cf43c':
  ADT #1823896: AVD Manager button in the AVD Selector.
2009-04-30 18:11:16 -07:00
Reena Lee
c61962694a am 22056a6: am 9844b75: AI 148100: Testing out PDK updates by updating /
Merge commit '22056a6526fd754a3a4cd99cdad5001c85a6b623'

* commit '22056a6526fd754a3a4cd99cdad5001c85a6b623':
  AI 148100: Testing out PDK updates by updating /device/partner/ references in the "building a new device" steps
2009-04-30 18:11:16 -07:00
Mike Ritter
b4423cd63b am 7ce0733: am 925f5d2: AI 148090: Whichdoc = online/offline
Merge commit '7ce0733ba9428c6616df499f99e17e2ed27cd93f'

* commit '7ce0733ba9428c6616df499f99e17e2ed27cd93f':
  AI 148090: Whichdoc = online/offline
2009-04-30 18:11:16 -07:00
Android (Google) Code Review
5f6be13bf7 am 5941176: Merge change 822 into donut
Merge commit '5941176ccd7f05ed1786f0b45ecc0905b0effc49'

* commit '5941176ccd7f05ed1786f0b45ecc0905b0effc49':
  Move some simulator fixes from master to donut.
2009-04-30 18:11:16 -07:00
Xavier Ducrohet
625180dd22 merged development with conflicts.... 2009-04-30 17:35:21 -07:00
David Warren
140eed1ac5 am 2b15cf1: AI 148129: Missing \ in Pdk.Mk causing build to not go throu
Merge commit '2b15cf1abf2f41e3a9f7edc99d65a9e9d38e6c25' into donut

* commit '2b15cf1abf2f41e3a9f7edc99d65a9e9d38e6c25':
  AI 148129: Missing \ in Pdk.Mk causing build to not go through - Gaurav
2009-04-30 17:27:16 -07:00
Reena Lee
7e2a21adcc am 390be0e: AI 148128: -Removed "Option1" about using buildspec which is
Merge commit '390be0e33d61654113b4bdc9b1974b33eebd2205' into donut

* commit '390be0e33d61654113b4bdc9b1974b33eebd2205':
  AI 148128: -Removed "Option1" about using buildspec which is no longer relevant.
2009-04-30 17:27:16 -07:00
David Warren
a8300ee2fc am 1b4feb4: AI 148118: 2 new debugging docs.
Merge commit '1b4feb4926e8b34b10569f492a7f06175d3829bb' into donut

* commit '1b4feb4926e8b34b10569f492a7f06175d3829bb':
  AI 148118: 2 new debugging docs.
2009-04-30 17:27:15 -07:00
David Warren
b70a01271d am e0d7b8a: AI 148117: these docs have moved into "guide" directory.
Merge commit 'e0d7b8a65d51912228d920f8b884f401146531e2' into donut

* commit 'e0d7b8a65d51912228d920f8b884f401146531e2':
  AI 148117: these docs have moved into "guide" directory.
2009-04-30 17:27:15 -07:00
David Warren
969e009757 am 5f6ca4f: AI 148105: Assigning to Ryan for Dr No Approval.
Merge commit '5f6ca4f519a1a9375628102f284ab059fd0ef4a1' into donut

* commit '5f6ca4f519a1a9375628102f284ab059fd0ef4a1':
  AI 148105: Assigning to Ryan for Dr No Approval.
2009-04-30 17:27:14 -07:00
David Warren
2b15cf1abf AI 148129: Missing \ in Pdk.Mk causing build to not go through - Gaurav
Automated import of CL 148129
2009-04-30 17:23:42 -07:00
Reena Lee
390be0e33d AI 148128: -Removed "Option1" about using buildspec which is no longer relevant.
-Updated paths to no longer reference device/

Automated import of CL 148128
2009-04-30 17:22:16 -07:00
Android (Google) Code Review
7d645177b5 Merge change 839 into donut
* changes:
  ADT #1823896: AVD Manager button in the AVD Selector.
2009-04-30 17:18:00 -07:00
David Warren
1b4feb4926 AI 148118: 2 new debugging docs.
Automated import of CL 148118
2009-04-30 17:16:25 -07:00
Raphael
e940a1cad7 ADT #1823896: AVD Manager button in the AVD Selector.
Device chooser: avd manager callback + avd list refresh.
Device chooser: dialog title.
Device launcher tab: avd manager callaback + avd list refresh.
2009-04-30 17:14:58 -07:00
David Warren
e0d7b8a65d AI 148117: these docs have moved into "guide" directory.
Automated import of CL 148117
2009-04-30 17:14:56 -07:00
David Warren
5f6ca4f519 AI 148105: Assigning to Ryan for Dr No Approval.
These are new content files for the partner development kit that will be hosted off of source.android.com externally.

Automated import of CL 148105
2009-04-30 17:11:58 -07:00
Reena Lee
22056a6526 am 9844b75: AI 148100: Testing out PDK updates by updating /device/partn
Merge commit '9844b7560db1101ef69186fa93fc062ca9fe7c3a' into donut

* commit '9844b7560db1101ef69186fa93fc062ca9fe7c3a':
  AI 148100: Testing out PDK updates by updating /device/partner/ references in the "building a new device" steps
2009-04-30 17:09:29 -07:00
Mike Ritter
7ce0733ba9 am 925f5d2: AI 148090: Whichdoc = online/offline
Merge commit '925f5d2ee93268cec699210b8f61858211da7289' into donut

* commit '925f5d2ee93268cec699210b8f61858211da7289':
  AI 148090: Whichdoc = online/offline
2009-04-30 17:09:29 -07:00