Refactored Android samples / embedder.

samples/android_embedder/builtin_nolib.cc

Index: samples/android_embedder/builtin_nolib.cc
diff --git a/samples/android_embedder/builtin_nolib.cc b/samples/android_embedder/builtin_nolib.cc
deleted file mode 100644
index 06b469e736753c98384386e932aa3dac26622603..0000000000000000000000000000000000000000
--- a/samples/android_embedder/builtin_nolib.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-#include <stdio.h>
-
-#include "include/dart_api.h"
-
-#include "bin/builtin.h"
-#include "bin/dartutils.h"
-#include "bin/io_natives.h"
-
-Builtin::builtin_lib_props Builtin::builtin_libraries_[] = {
-  /* { url_, source_, patch_url_, patch_source_, has_natives_ } */
-  { DartUtils::kBuiltinLibURL, NULL, NULL, NULL, true },
-  { DartUtils::kJsonLibURL, NULL, NULL, NULL, false },
-  { DartUtils::kUriLibURL, NULL, NULL, NULL, false },
-  { DartUtils::kCryptoLibURL, NULL, NULL, NULL, false },
-  { DartUtils::kIOLibURL, NULL, NULL, NULL, true  },
-  { DartUtils::kUtfLibURL, NULL, NULL, NULL, false }
-};
-
-
-Dart_Handle Builtin::Source(BuiltinLibraryId id) {
-  ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
-         kInvalidLibrary);
-  return Dart_NewApiError("Unreachable code in Builtin::Source (%d).", id);
-}
-
-/**
- * Looks up native functions in both libdart_builtin and libdart_io.
- */
-Dart_NativeFunction Builtin::NativeLookup(Dart_Handle name,
-                                          int argument_count) {
-  return BuiltinNativeLookup(name, argument_count);
-}
-
-void Builtin::SetNativeResolver(BuiltinLibraryId id) {
-  ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
-         kInvalidLibrary);
-  ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
-  if (builtin_libraries_[id].has_natives_) {
-    Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_);
-    Dart_Handle library = Dart_LookupLibrary(url);
-    ASSERT(!Dart_IsError(library));
-    // Setup the native resolver for built in library functions.
-    DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
-  }
-}
-
-
-Dart_Handle Builtin::LoadAndCheckLibrary(BuiltinLibraryId id) {
-  ASSERT((sizeof(builtin_libraries_) / sizeof(builtin_lib_props)) ==
-         kInvalidLibrary);
-  ASSERT(id >= kBuiltinLibrary && id < kInvalidLibrary);
-  Dart_Handle url = DartUtils::NewString(builtin_libraries_[id].url_);
-  Dart_Handle library = Dart_LookupLibrary(url);
-  if (Dart_IsError(library)) {
-    ASSERT(id > kUtfLibrary);
-    library = Dart_LoadLibrary(url, Source(id));
-    if (!Dart_IsError(library) && (builtin_libraries_[id].has_natives_)) {
-      // Setup the native resolver for built in library functions.
-      DART_CHECK_VALID(Dart_SetNativeResolver(library, NativeLookup));
-    }
-  }
-  DART_CHECK_VALID(library);
-  return library;
-}