diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk deleted file mode 100644 index b39c335db..000000000 --- a/cmds/app_process/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - app_main.cpp - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libutils \ - libbinder \ - libandroid_runtime - -LOCAL_MODULE:= app_process - -include $(BUILD_EXECUTABLE) - - -# Build a variant of app_process binary linked with ASan runtime. -# ARM-only at the moment. -ifeq ($(TARGET_ARCH),arm) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - app_main.cpp - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libutils \ - libbinder \ - libandroid_runtime - -LOCAL_MODULE := app_process__asan -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/asan -LOCAL_MODULE_STEM := app_process -LOCAL_ADDRESS_SANITIZER := true - -include $(BUILD_EXECUTABLE) - -endif # ifeq($(TARGET_ARCH),arm) diff --git a/cmds/app_process/MODULE_LICENSE_APACHE2 b/cmds/app_process/MODULE_LICENSE_APACHE2 deleted file mode 100644 index e69de29bb..000000000 diff --git a/cmds/app_process/NOTICE b/cmds/app_process/NOTICE deleted file mode 100644 index c5b1efa7a..000000000 --- a/cmds/app_process/NOTICE +++ /dev/null @@ -1,190 +0,0 @@ - - Copyright (c) 2005-2008, The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp deleted file mode 100644 index 6fe358c7e..000000000 --- a/cmds/app_process/app_main.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Main entry of app process. - * - * Starts the interpreted runtime, then starts up the application. - * - */ - -#define LOG_TAG "appproc" - -#include -#include -#include -#include -#include -#include - -#include -#include - -namespace android { - -void app_usage() -{ - fprintf(stderr, - "Usage: app_process [java-options] cmd-dir start-class-name [options]\n"); -} - -class AppRuntime : public AndroidRuntime -{ -public: - AppRuntime() - : mParentDir(NULL) - , mClassName(NULL) - , mClass(NULL) - , mArgC(0) - , mArgV(NULL) - { - } - -#if 0 - // this appears to be unused - const char* getParentDir() const - { - return mParentDir; - } -#endif - - const char* getClassName() const - { - return mClassName; - } - - virtual void onVmCreated(JNIEnv* env) - { - if (mClassName == NULL) { - return; // Zygote. Nothing to do here. - } - - /* - * This is a little awkward because the JNI FindClass call uses the - * class loader associated with the native method we're executing in. - * If called in onStarted (from RuntimeInit.finishInit because we're - * launching "am", for example), FindClass would see that we're calling - * from a boot class' native method, and so wouldn't look for the class - * we're trying to look up in CLASSPATH. Unfortunately it needs to, - * because the "am" classes are not boot classes. - * - * The easiest fix is to call FindClass here, early on before we start - * executing boot class Java code and thereby deny ourselves access to - * non-boot classes. - */ - char* slashClassName = toSlashClassName(mClassName); - mClass = env->FindClass(slashClassName); - if (mClass == NULL) { - ALOGE("ERROR: could not find class '%s'\n", mClassName); - } - free(slashClassName); - - mClass = reinterpret_cast(env->NewGlobalRef(mClass)); - } - - virtual void onStarted() - { - sp proc = ProcessState::self(); - ALOGV("App process: starting thread pool.\n"); - proc->startThreadPool(); - - AndroidRuntime* ar = AndroidRuntime::getRuntime(); - ar->callMain(mClassName, mClass, mArgC, mArgV); - - IPCThreadState::self()->stopProcess(); - } - - virtual void onZygoteInit() - { - sp proc = ProcessState::self(); - ALOGV("App process: starting thread pool.\n"); - proc->startThreadPool(); - } - - virtual void onExit(int code) - { - if (mClassName == NULL) { - // if zygote - IPCThreadState::self()->stopProcess(); - } - - AndroidRuntime::onExit(code); - } - - - const char* mParentDir; - const char* mClassName; - jclass mClass; - int mArgC; - const char* const* mArgV; -}; - -} - -using namespace android; - -/* - * sets argv0 to as much of newArgv0 as will fit - */ -static void setArgv0(const char *argv0, const char *newArgv0) -{ - strlcpy(const_cast(argv0), newArgv0, strlen(argv0)); -} - -int main(int argc, const char* const argv[]) -{ - // These are global variables in ProcessState.cpp - mArgC = argc; - mArgV = argv; - - mArgLen = 0; - for (int i=0; i -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -using namespace android; - -namespace android { -/** - * This class is used to kill this process when the runtime dies. - */ -class GrimReaper : public IBinder::DeathRecipient { -public: - GrimReaper() { } - - virtual void binderDied(const wp& who) - { - ALOGI("Grim Reaper killing system_server..."); - kill(getpid(), SIGKILL); - } -}; - -} // namespace android - - - -extern "C" status_t system_init() -{ - ALOGI("Entered system_init()"); - - sp proc(ProcessState::self()); - - sp sm = defaultServiceManager(); - ALOGI("ServiceManager: %p\n", sm.get()); - - sp grim = new GrimReaper(); - sm->asBinder()->linkToDeath(grim, grim.get(), 0); - - char propBuf[PROPERTY_VALUE_MAX]; - property_get("system_init.startsurfaceflinger", propBuf, "1"); - if (strcmp(propBuf, "1") == 0) { - // Start the SurfaceFlinger - SurfaceFlinger::instantiate(); - } - - property_get("system_init.startsensorservice", propBuf, "1"); - if (strcmp(propBuf, "1") == 0) { - // Start the sensor service - SensorService::instantiate(); - } - - // And now start the Android runtime. We have to do this bit - // of nastiness because the Android runtime initialization requires - // some of the core system services to already be started. - // All other servers should just start the Android runtime at - // the beginning of their processes's main(), before calling - // the init function. - ALOGI("System server: starting Android runtime.\n"); - AndroidRuntime* runtime = AndroidRuntime::getRuntime(); - - ALOGI("System server: starting Android services.\n"); - JNIEnv* env = runtime->getJNIEnv(); - if (env == NULL) { - return UNKNOWN_ERROR; - } - jclass clazz = env->FindClass("com/android/server/SystemServer"); - if (clazz == NULL) { - return UNKNOWN_ERROR; - } - jmethodID methodId = env->GetStaticMethodID(clazz, "init2", "()V"); - if (methodId == NULL) { - return UNKNOWN_ERROR; - } - env->CallStaticVoidMethod(clazz, methodId); - - ALOGI("System server: entering thread pool.\n"); - ProcessState::self()->startThreadPool(); - IPCThreadState::self()->joinThreadPool(); - ALOGI("System server: exiting thread pool.\n"); - - return NO_ERROR; -} diff --git a/cmds/system_server/system_main.cpp b/cmds/system_server/system_main.cpp deleted file mode 100644 index ddff065c9..000000000 --- a/cmds/system_server/system_main.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Main entry of system server process. - * - * Calls the standard system initialization function, and then - * puts the main thread into the thread pool so it can handle - * incoming transactions. - * - */ - -#define LOG_TAG "sysproc" - -#include -#include - -#include - -#include -#include - -#include -#include -#include - -using namespace android; - -extern "C" status_t system_init(); - -bool finish_system_init() -{ - return true; -} - -static void blockSignals() -{ - sigset_t mask; - int cc; - - sigemptyset(&mask); - sigaddset(&mask, SIGQUIT); - sigaddset(&mask, SIGUSR1); - cc = sigprocmask(SIG_BLOCK, &mask, NULL); - assert(cc == 0); -} - -int main(int argc, const char* const argv[]) -{ - ALOGI("System server is starting with pid=%d.\n", getpid()); - - blockSignals(); - - // You can trust me, honestly! - ALOGW("*** Current priority: %d\n", getpriority(PRIO_PROCESS, 0)); - setpriority(PRIO_PROCESS, 0, -1); - - system_init(); -}