Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41977d7c authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //branches/cupcake/...@132276

parent dca10d53

cleanspec.mk

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Browser_intermed 
$(call add-clean-step, rm -f vendor/google/apps/Talk/res/drawable/%*)

$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_os_NetStat.o)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/libjni_andpyime_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/SHARED_LIBRARIES/share)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/Makefile

+12 −3
Original line number Diff line number Diff line
@@ -618,7 +618,14 @@ recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system 
recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img

recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET)

recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery

recovery_resources := $(call include-path-for, recovery)/res

recovery_resources_common := $(call include-path-for, recovery)/res

recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res))

recovery_resource_deps := $(shell find $(recovery_resources_common) \

  $(recovery_resources_private) -type f)



ifeq ($(recovery_resources_private),)

  $(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE))

endif



INTERNAL_RECOVERYIMAGE_ARGS := \

	$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \
@@ -636,7 +643,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) \ 
		$(recovery_binary) \

		$(recovery_initrc) $(recovery_kernel) \

		$(INSTALLED_2NDBOOTLOADER_TARGET) \

		$(recovery_build_prop)

		$(recovery_build_prop) $(recovery_resource_deps)

	@echo ----- Making recovery image ------

	rm -rf $(TARGET_RECOVERY_OUT)

	mkdir -p $(TARGET_RECOVERY_OUT)
@@ -648,7 +655,9 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) \ 
	echo Modifying ramdisk contents...

	cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/

	cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/

	cp -rf $(recovery_resources) $(TARGET_RECOVERY_ROOT_OUT)/

	cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/

	$(foreach item,$(recovery_resources_private), \

	  cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)

	cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \

	        > $(TARGET_RECOVERY_ROOT_OUT)/default.prop

	$(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | gzip > $(recovery_ramdisk)

core/main.mk

+12 −5
Original line number Diff line number Diff line
@@ -313,11 +313,18 @@ ifeq ($(BUILD_TINY_ANDROID), true) 
INTERNAL_DEFAULT_DOCS_TARGETS := 



subdirs := \

	bionic \

	system/core \

	external/zlib \

	build/tools \

	tools/kcm \

	external/yaffs2

	build/libs \

	build/target \

	build/tools/acp \

	build/tools/apriori \

	build/tools/kcm \

	build/tools/soslim \

	external/elfcopy \

	external/elfutils \

	external/yaffs2 \

	external/zlib

else	# !BUILD_TINY_ANDROID



#
@@ -489,7 +496,7 @@ overridden_packages := $(call get-package-overrides,$(modules_to_build)) 
ifdef overridden_packages

#  old_modules_to_build := $(modules_to_build)

  modules_to_build := \

      $(filter-out $(foreach p,$(overridden_packages),%/$(p) %/$(p).apk), \

      $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \

          $(modules_to_build))

endif

#$(error filtered out $(filter-out $(modules_to_build),$(old_modules_to_build)))

core/tasks/apicheck.mk

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
# api compatibility or added apis illegally.

#



ifneq ($(BUILD_TINY_ANDROID), true)



.PHONY: checkapi



# eval this to define a rule that runs apicheck.
@@ -71,3 +73,4 @@ update-api: $(INTERNAL_PLATFORM_API_FILE) | $(ACP) 
	@echo Copying current.xml

	$(hide) $(ACP) $(INTERNAL_PLATFORM_API_FILE) $(SRC_API_DIR)/current.xml



endif

tools/droiddoc/templates-sdk/customization.cs

+108 −91
Original line number Diff line number Diff line 
<?cs # This default template file is meant to be replaced. ?>

<?cs # Use the -tempatedir arg to javadoc to set your own directory with a replacement for this file in it. ?>



<?cs def:custom_masthead() ?>

<?cs 

def:custom_masthead() ?>

  <div id="header">

      <div id="headerLeft">

          <a href="<?cs var:toroot ?>index.html" tabindex="-1"><img

              src="<?cs var:toroot ?>assets/images/bg_logo.png" alt="Android Developers" /></a>



          <ul class="<?cs 

                  if:reference ?>reference<?cs

                  elif:guide ?>guide<?cs
@@ -19,7 +19,6 @@ 
                  if:android.whichdoc != "online" ?>offline.html<?cs 

                  else ?>index.html<?cs /if ?>">

                  <span>Home</span></a></li>

            

              <li id="sdk-link"><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html"><span>SDK</span></a></li>

              <li id="guide-link"><a href="<?cs var:toroot ?>guide/index.html"

                                  onClick="return loadLast('guide')"><span>Dev Guide</span></a></li>
@@ -28,7 +27,6 @@ 
              <li><a href="http://android-developers.blogspot.com"><span>Blog</span></a></li>

              <li id="community-link"><a href="<?cs var:toroot ?>community/index.html"><span>Community</span></a></li>

          </ul>



      </div>

      <div id="headerRight">

          <div id="headerLinks">
@@ -37,29 +35,28 @@ 
              <!-- &nbsp;<a href="#">English</a> | -->

              <a href="http://www.android.com">Android.com</a>

            </span>

        </div>



        <?cs call:default_search_box() ?>



          </div><?cs 

          call:default_search_box() ?>

      </div><!-- headerRight -->

</div><!-- header -->

  </div><!-- header --><?cs 

/def ?><?cs # custom_masthead ?>



<?cs /def ?><?cs # custom_masthead ?>



<?cs def:sdk_nav() ?>

<?cs 

def:sdk_nav() ?>

  <div class="g-section g-tpl-240" id="body-content">

    <div class="g-unit g-first not-resizable" id="side-nav">

    <div id="devdoc-nav">

      <?cs include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>

      <div id="devdoc-nav"><?cs 

        include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>

      </div>

    </div> <!-- end side-nav -->

<?cs /def ?>



<?cs def:guide_nav() ?>

<?cs 

def:guide_nav() ?>

  <div class="g-section g-tpl-240" id="body-content">

    <div class="g-unit g-first side-nav-resizable" id="side-nav">

    <div id="devdoc-nav">

      <?cs include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>

      <div id="devdoc-nav"><?cs 

        include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>

      </div>

    </div> <!-- end side-nav -->

    <script>
@@ -69,36 +66,56 @@ 
    </script>

<?cs /def ?>



<?cs def:custom_left_nav() ?>

  <?cs if:guide ?>

    <?cs call:guide_nav() ?>

  <?cs elif:sdk ?>

    <?cs call:sdk_nav() ?>

  <?cs else ?>

    <?cs call:default_left_nav() ?> 

  <?cs /if ?>

<?cs 

def:publish_nav() ?>

  <div class="g-section g-tpl-180" id="body-content">

    <div class="g-unit g-first" id="side-nav">

      <div id="devdoc-nav"><?cs 

        include:"../../../../frameworks/base/docs/html/publish/publish_toc.cs" ?>

      </div>

    </div> <!-- end side-nav -->

<?cs /def ?>



<?cs # appears on the left side of the blue bar at the bottom of every page ?>

<?cs def:custom_cc_copyright() ?>Except as noted, this content is 

<?cs 

def:custom_left_nav() ?><?cs 

  if:guide ?><?cs 

    call:guide_nav() ?><?cs 

  elif:publish ?><?cs 

    call:publish_nav() ?><?cs 

  elif:sdk ?><?cs 

    call:sdk_nav() ?><?cs 

  else ?><?cs 

    call:default_left_nav() ?><?cs 

  /if ?><?cs 

/def ?>



<?cs # appears at the bottom of every page ?><?cs 

def:custom_cc_copyright() ?>

  Except as noted, this content is 

  licensed under <a href="http://creativecommons.org/licenses/by/2.5/">

  Creative Commons Attribution 2.5</a>. For details and 

  restrictions, see the <a href="<?cs var:toroot ?>license.html">Content 

License</a>.<?cs /def ?>

  License</a>.<?cs 

/def ?>



<?cs def:custom_copyright() ?>Except as noted, this content is 

licensed under <a

<?cs 

def:custom_copyright() ?>

  Except as noted, this content is licensed under <a

  href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>. 

  For details and restrictions, see the <a href="<?cs var:toroot ?>license.html">

Content License</a>.<?cs /def ?>

  Content License</a>.<?cs 

/def ?>



<?cs def:custom_footerlinks() ?>

<?cs 

def:custom_footerlinks() ?>

  <p>

    <a href="http://www.android.com/terms.html">Site Terms of Service</a> -

    <a href="http://www.android.com/privacy.html">Privacy Policy</a> -

    <a href="http://www.android.com/branding.html">Brand Guidelines</a>

</p>

<?cs /def ?>

  </p><?cs 

/def ?>



<?cs # appears on the right side of the blue bar at the bottom of every page ?>

<?cs def:custom_buildinfo() ?>Android 1.1 r1 - <?cs var:page.now ?><?cs /def ?>
 
<?cs # appears on the right side of the blue bar at the bottom of every page ?><?cs 

def:custom_buildinfo() ?>

  Android 1.1 r1 - <?cs var:page.now ?><?cs 

/def ?>