diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 15:23:51 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 15:23:51 +0100 |
| commit | dedee688fdb89b55be2b130e3296abce98e12698 (patch) | |
| tree | e46cb69f1426df33ce5f73de201110eb991edb9c /test/android/32or64.c | |
| parent | 660ce69071c71478d56ee214e3f261ffd9b1f8c3 (diff) | |
| parent | db3c3aeef1c21f1e321a4c6505a8c57536729610 (diff) | |
| download | gyp-lollipop-mr1-wfc-release.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85candroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
This commit was generated by merge_to_master.py.
Change-Id: I3482cf8f4cb05f125009d224dcff02ca57b23446
Diffstat (limited to 'test/android/32or64.c')
| -rw-r--r-- | test/android/32or64.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/android/32or64.c b/test/android/32or64.c new file mode 100644 index 00000000..3ea81692 --- /dev/null +++ b/test/android/32or64.c @@ -0,0 +1,13 @@ +/* Copyright (c) 2014 Google Inc. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +const char* getString() +{ +#ifdef __LP64__ + return "Hello, 64-bit world!\n"; +#else + return "Hello, 32-bit world!\n"; +#endif +} |