diff options
author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 17:07:18 +0000 |
---|---|---|
committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 17:07:18 +0000 |
commit | c1101582596cf8ae3ebac732d9d3afcf76f479f2 (patch) | |
tree | 17c73280c584f50a31b19c3c2d50c446f058fe72 /Android.mk | |
parent | f8b57189b43716dc81cffac74e1f15616ca43cf8 (diff) | |
download | chromium_src-c1101582596cf8ae3ebac732d9d3afcf76f479f2.zip chromium_src-c1101582596cf8ae3ebac732d9d3afcf76f479f2.tar.gz chromium_src-c1101582596cf8ae3ebac732d9d3afcf76f479f2.tar.bz2 |
Fixes to allow building in an Android tree
- Add empty Android.mk to prevent the Android build system from erroneously
picking up other Android.mk files.
- Rename content_shell_content_view to libcontent_shell_content_view as Android
build system requires that shared library target names start with 'lib'.
Review URL: https://chromiumcodereview.appspot.com/10637006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..d8600fb --- /dev/null +++ b/Android.mk @@ -0,0 +1,6 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This is an empty Android makefile to prevent the Android build system from +# erroneously picking up other Android.mk files in the Chromium tree. |